wip

lib/NGCP/Schema.pm

@@ -4,13 +4,21 @@ use aliased 'NGCP::Schema::Exception';
 use NGCP::Schema::Config qw();
 use Regexp::Common qw(net);
 use Regexp::IPv6 qw($IPv6_re);
+use MooseX::ClassAttribute qw(class_has);
+extends 'DBIx::Class::Schema';
 
 our $VERSION = '1.003';
 
-has('config', is => 'rw', isa => 'NGCP::Schema::Config', lazy => 1, default => sub {
+__PACKAGE__->load_namespaces;
+
+class_has('config', is => 'rw', isa => 'NGCP::Schema::Config', lazy => 1, default => sub {
     return NGCP::Schema::Config->instance;
 });
 
+method connection {
+    $self->SUPER::connection($self->config->as_hash->{database});
+}
+
 method validate($data, $mandatory_params, $optional_params?) {
     Exception->throw({
         description => 'Client.Syntax.MissingParam',
@@ -106,6 +114,23 @@ L<NGCP::Schema::ngcp>,
 L<NGCP::Schema::provisioning>,
 L<NGCP::Schema::sipstats>.
 
+=head1 INCOMPATIBILITIES
+
+Version 2 moves the result classes of all tables into one namespace. This means the following table names collide:
+
+    accounting.acc_backup       kamailio.acc_backup
+    accounting.acc_trash        kamailio.acc_trash
+    accounting.acc              kamailio.acc
+    accounting.mark             sipstats.mark
+    billing.contracts           carrier.contracts
+    billing.customers           carrier.customers
+    billing.orders              carrier.orders
+    billing.payments            carrier.payments
+    billing.voip_subscribers    provisioning.voip_subscribers
+
+This is solved by prefixing the result class name I<on the right-hand side only> with the database name and an
+underscore, e.g. table C<provisioning.voip_subscribers> becomes the result class <provisioning_voip_subscribers>.
+
 =head1 BUGS AND LIMITATIONS
 
 L<https://bugtracker.sipwise.com>

lib/NGCP/Schema/Result/acc.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::accounting::Result::acc;
+package NGCP::Schema::Result::acc;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("acc");
+__PACKAGE__->table("accounting.acc");
 
 
 __PACKAGE__->add_columns(
@@ -81,7 +81,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::accounting::Result::acc
+NGCP::Schema::Result::acc
 
 =head1 COMPONENTS LOADED
 
@@ -93,7 +93,7 @@ NGCP::Schema::accounting::Result::acc
 
 =back
 
-=head1 TABLE: C<acc>
+=head1 TABLE: C<accounting.acc>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/acc_backup.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::accounting::Result::acc_backup;
+package NGCP::Schema::Result::acc_backup;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("acc_backup");
+__PACKAGE__->table("accounting.acc_backup");
 
 
 __PACKAGE__->add_columns(
@@ -81,7 +81,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::accounting::Result::acc_backup
+NGCP::Schema::Result::acc_backup
 
 =head1 COMPONENTS LOADED
 
@@ -93,7 +93,7 @@ NGCP::Schema::accounting::Result::acc_backup
 
 =back
 
-=head1 TABLE: C<acc_backup>
+=head1 TABLE: C<accounting.acc_backup>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/acc_trash.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::accounting::Result::acc_trash;
+package NGCP::Schema::Result::acc_trash;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("acc_trash");
+__PACKAGE__->table("accounting.acc_trash");
 
 
 __PACKAGE__->add_columns(
@@ -81,7 +81,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::accounting::Result::acc_trash
+NGCP::Schema::Result::acc_trash
 
 =head1 COMPONENTS LOADED
 
@@ -93,7 +93,7 @@ NGCP::Schema::accounting::Result::acc_trash
 
 =back
 
-=head1 TABLE: C<acc_trash>
+=head1 TABLE: C<accounting.acc_trash>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/active_watchers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::active_watchers;
+package NGCP::Schema::Result::active_watchers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("active_watchers");
+__PACKAGE__->table("kamailio.active_watchers");
 
 
 __PACKAGE__->add_columns(
@@ -96,7 +96,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::active_watchers
+NGCP::Schema::Result::active_watchers
 
 =head1 COMPONENTS LOADED
 
@@ -108,7 +108,7 @@ NGCP::Schema::kamailio::Result::active_watchers
 
 =back
 
-=head1 TABLE: C<active_watchers>
+=head1 TABLE: C<kamailio.active_watchers>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/address.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::address;
+package NGCP::Schema::Result::address;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("address");
+__PACKAGE__->table("kamailio.address");
 
 
 __PACKAGE__->add_columns(
@@ -60,7 +60,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::address
+NGCP::Schema::Result::address
 
 =head1 COMPONENTS LOADED
 
@@ -72,7 +72,7 @@ NGCP::Schema::kamailio::Result::address
 
 =back
 
-=head1 TABLE: C<address>
+=head1 TABLE: C<kamailio.address>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/admins.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::admins;
+package NGCP::Schema::Result::admins;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON", "EncodedColumn");
 
 
-__PACKAGE__->table("admins");
+__PACKAGE__->table("billing.admins");
 
 
 __PACKAGE__->add_columns(
@@ -70,7 +70,7 @@ __PACKAGE__->add_unique_constraint("login_idx", ["login"]);
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -89,7 +89,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::admins
+NGCP::Schema::Result::admins
 
 =head1 COMPONENTS LOADED
 
@@ -101,7 +101,7 @@ NGCP::Schema::billing::Result::admins
 
 =back
 
-=head1 TABLE: C<admins>
+=head1 TABLE: C<billing.admins>
 
 =head1 ACCESSORS
 
@@ -197,7 +197,7 @@ NGCP::Schema::billing::Result::admins
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =cut
 

lib/NGCP/Schema/Result/aliases.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::aliases;
+package NGCP::Schema::Result::aliases;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("aliases");
+__PACKAGE__->table("kamailio.aliases");
 
 
 __PACKAGE__->add_columns(
@@ -99,7 +99,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::aliases
+NGCP::Schema::Result::aliases
 
 =head1 COMPONENTS LOADED
 
@@ -111,7 +111,7 @@ NGCP::Schema::kamailio::Result::aliases
 
 =back
 
-=head1 TABLE: C<aliases>
+=head1 TABLE: C<kamailio.aliases>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/billing_fees.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_fees;
+package NGCP::Schema::Result::billing_fees;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_fees");
+__PACKAGE__->table("billing.billing_fees");
 
 
 __PACKAGE__->add_columns(
@@ -104,7 +104,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->has_many(
   "billing_fees_histories",
-  "NGCP::Schema::billing::Result::billing_fees_history",
+  "NGCP::Schema::Result::billing_fees_history",
   { "foreign.bf_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -112,7 +112,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "billing_profile",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { id => "billing_profile_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -120,7 +120,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "billing_zone",
-  "NGCP::Schema::billing::Result::billing_zones",
+  "NGCP::Schema::Result::billing_zones",
   { id => "billing_zone_id" },
   {
     is_deferrable => 1,
@@ -139,7 +139,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_fees
+NGCP::Schema::Result::billing_fees
 
 =head1 COMPONENTS LOADED
 
@@ -151,7 +151,7 @@ NGCP::Schema::billing::Result::billing_fees
 
 =back
 
-=head1 TABLE: C<billing_fees>
+=head1 TABLE: C<billing.billing_fees>
 
 =head1 ACCESSORS
 
@@ -275,19 +275,19 @@ NGCP::Schema::billing::Result::billing_fees
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_fees_history>
+Related object: L<NGCP::Schema::Result::billing_fees_history>
 
 =head2 billing_profile
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =head2 billing_zone
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_zones>
+Related object: L<NGCP::Schema::Result::billing_zones>
 
 =cut
 

lib/NGCP/Schema/Result/billing_fees_history.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_fees_history;
+package NGCP::Schema::Result::billing_fees_history;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_fees_history");
+__PACKAGE__->table("billing.billing_fees_history");
 
 
 __PACKAGE__->add_columns(
@@ -106,7 +106,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "bf",
-  "NGCP::Schema::billing::Result::billing_fees",
+  "NGCP::Schema::Result::billing_fees",
   { id => "bf_id" },
   {
     is_deferrable => 1,
@@ -119,7 +119,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "billing_zones_history",
-  "NGCP::Schema::billing::Result::billing_zones_history",
+  "NGCP::Schema::Result::billing_zones_history",
   { id => "billing_zones_history_id" },
   {
     is_deferrable => 1,
@@ -138,7 +138,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_fees_history
+NGCP::Schema::Result::billing_fees_history
 
 =head1 COMPONENTS LOADED
 
@@ -150,7 +150,7 @@ NGCP::Schema::billing::Result::billing_fees_history
 
 =back
 
-=head1 TABLE: C<billing_fees_history>
+=head1 TABLE: C<billing.billing_fees_history>
 
 =head1 ACCESSORS
 
@@ -280,13 +280,13 @@ NGCP::Schema::billing::Result::billing_fees_history
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_fees>
+Related object: L<NGCP::Schema::Result::billing_fees>
 
 =head2 billing_zones_history
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_zones_history>
+Related object: L<NGCP::Schema::Result::billing_zones_history>
 
 =cut
 

lib/NGCP/Schema/Result/billing_mappings.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_mappings;
+package NGCP::Schema::Result::billing_mappings;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_mappings");
+__PACKAGE__->table("billing.billing_mappings");
 
 
 __PACKAGE__->add_columns(
@@ -67,7 +67,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "billing_profile",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { id => "billing_profile_id" },
   {
     is_deferrable => 1,
@@ -80,7 +80,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -88,7 +88,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "product",
-  "NGCP::Schema::billing::Result::products",
+  "NGCP::Schema::Result::products",
   { id => "product_id" },
   {
     is_deferrable => 1,
@@ -107,7 +107,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_mappings
+NGCP::Schema::Result::billing_mappings
 
 =head1 COMPONENTS LOADED
 
@@ -119,7 +119,7 @@ NGCP::Schema::billing::Result::billing_mappings
 
 =back
 
-=head1 TABLE: C<billing_mappings>
+=head1 TABLE: C<billing.billing_mappings>
 
 =head1 ACCESSORS
 
@@ -177,19 +177,19 @@ NGCP::Schema::billing::Result::billing_mappings
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =head2 contract
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 product
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::products>
+Related object: L<NGCP::Schema::Result::products>
 
 =cut
 

lib/NGCP/Schema/Result/billing_peaktime_special.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_peaktime_special;
+package NGCP::Schema::Result::billing_peaktime_special;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_peaktime_special");
+__PACKAGE__->table("billing.billing_peaktime_special");
 
 
 __PACKAGE__->add_columns(
@@ -53,7 +53,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "billing_profile",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { id => "billing_profile_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -67,7 +67,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_peaktime_special
+NGCP::Schema::Result::billing_peaktime_special
 
 =head1 COMPONENTS LOADED
 
@@ -79,7 +79,7 @@ NGCP::Schema::billing::Result::billing_peaktime_special
 
 =back
 
-=head1 TABLE: C<billing_peaktime_special>
+=head1 TABLE: C<billing.billing_peaktime_special>
 
 =head1 ACCESSORS
 
@@ -123,7 +123,7 @@ NGCP::Schema::billing::Result::billing_peaktime_special
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =cut
 

lib/NGCP/Schema/Result/billing_peaktime_weekdays.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_peaktime_weekdays;
+package NGCP::Schema::Result::billing_peaktime_weekdays;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_peaktime_weekdays");
+__PACKAGE__->table("billing.billing_peaktime_weekdays");
 
 
 __PACKAGE__->add_columns(
@@ -47,7 +47,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "billing_profile",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { id => "billing_profile_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -61,7 +61,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_peaktime_weekdays
+NGCP::Schema::Result::billing_peaktime_weekdays
 
 =head1 COMPONENTS LOADED
 
@@ -73,7 +73,7 @@ NGCP::Schema::billing::Result::billing_peaktime_weekdays
 
 =back
 
-=head1 TABLE: C<billing_peaktime_weekdays>
+=head1 TABLE: C<billing.billing_peaktime_weekdays>
 
 =head1 ACCESSORS
 
@@ -121,7 +121,7 @@ NGCP::Schema::billing::Result::billing_peaktime_weekdays
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =cut
 

lib/NGCP/Schema/Result/billing_profiles.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_profiles;
+package NGCP::Schema::Result::billing_profiles;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_profiles");
+__PACKAGE__->table("billing.billing_profiles");
 
 
 __PACKAGE__->add_columns(
@@ -91,7 +91,7 @@ __PACKAGE__->add_unique_constraint("resnam_idx", ["reseller_id", "name"]);
 
 __PACKAGE__->has_many(
   "billing_fees",
-  "NGCP::Schema::billing::Result::billing_fees",
+  "NGCP::Schema::Result::billing_fees",
   { "foreign.billing_profile_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -99,7 +99,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "billing_mappings",
-  "NGCP::Schema::billing::Result::billing_mappings",
+  "NGCP::Schema::Result::billing_mappings",
   { "foreign.billing_profile_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -107,7 +107,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "billing_peaktime_specials",
-  "NGCP::Schema::billing::Result::billing_peaktime_special",
+  "NGCP::Schema::Result::billing_peaktime_special",
   { "foreign.billing_profile_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -115,7 +115,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "billing_peaktime_weekdays",
-  "NGCP::Schema::billing::Result::billing_peaktime_weekdays",
+  "NGCP::Schema::Result::billing_peaktime_weekdays",
   { "foreign.billing_profile_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -123,7 +123,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "billing_zones",
-  "NGCP::Schema::billing::Result::billing_zones",
+  "NGCP::Schema::Result::billing_zones",
   { "foreign.billing_profile_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -131,7 +131,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "products",
-  "NGCP::Schema::billing::Result::products",
+  "NGCP::Schema::Result::products",
   { "foreign.billing_profile_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -139,7 +139,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -158,7 +158,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_profiles
+NGCP::Schema::Result::billing_profiles
 
 =head1 COMPONENTS LOADED
 
@@ -170,7 +170,7 @@ NGCP::Schema::billing::Result::billing_profiles
 
 =back
 
-=head1 TABLE: C<billing_profiles>
+=head1 TABLE: C<billing.billing_profiles>
 
 =head1 ACCESSORS
 
@@ -328,43 +328,43 @@ NGCP::Schema::billing::Result::billing_profiles
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_fees>
+Related object: L<NGCP::Schema::Result::billing_fees>
 
 =head2 billing_mappings
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_mappings>
+Related object: L<NGCP::Schema::Result::billing_mappings>
 
 =head2 billing_peaktime_specials
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_peaktime_special>
+Related object: L<NGCP::Schema::Result::billing_peaktime_special>
 
 =head2 billing_peaktime_weekdays
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_peaktime_weekdays>
+Related object: L<NGCP::Schema::Result::billing_peaktime_weekdays>
 
 =head2 billing_zones
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_zones>
+Related object: L<NGCP::Schema::Result::billing_zones>
 
 =head2 products
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::products>
+Related object: L<NGCP::Schema::Result::products>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =cut
 

lib/NGCP/Schema/Result/billing_zones.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_zones;
+package NGCP::Schema::Result::billing_zones;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_zones");
+__PACKAGE__->table("billing.billing_zones");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ __PACKAGE__->add_unique_constraint("profnamdes_idx", ["billing_profile_id", "zon
 
 __PACKAGE__->has_many(
   "billing_fees",
-  "NGCP::Schema::billing::Result::billing_fees",
+  "NGCP::Schema::Result::billing_fees",
   { "foreign.billing_zone_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -56,7 +56,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "billing_profile",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { id => "billing_profile_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -64,7 +64,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "billing_zones_histories",
-  "NGCP::Schema::billing::Result::billing_zones_history",
+  "NGCP::Schema::Result::billing_zones_history",
   { "foreign.bz_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -78,7 +78,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_zones
+NGCP::Schema::Result::billing_zones
 
 =head1 COMPONENTS LOADED
 
@@ -90,7 +90,7 @@ NGCP::Schema::billing::Result::billing_zones
 
 =back
 
-=head1 TABLE: C<billing_zones>
+=head1 TABLE: C<billing.billing_zones>
 
 =head1 ACCESSORS
 
@@ -148,19 +148,19 @@ NGCP::Schema::billing::Result::billing_zones
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_fees>
+Related object: L<NGCP::Schema::Result::billing_fees>
 
 =head2 billing_profile
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =head2 billing_zones_histories
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_zones_history>
+Related object: L<NGCP::Schema::Result::billing_zones_history>
 
 =cut
 

lib/NGCP/Schema/Result/billing_zones_history.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::billing_zones_history;
+package NGCP::Schema::Result::billing_zones_history;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("billing_zones_history");
+__PACKAGE__->table("billing.billing_zones_history");
 
 
 __PACKAGE__->add_columns(
@@ -47,7 +47,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->has_many(
   "billing_fees_histories",
-  "NGCP::Schema::billing::Result::billing_fees_history",
+  "NGCP::Schema::Result::billing_fees_history",
   { "foreign.billing_zones_history_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -55,7 +55,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "bz",
-  "NGCP::Schema::billing::Result::billing_zones",
+  "NGCP::Schema::Result::billing_zones",
   { id => "bz_id" },
   {
     is_deferrable => 1,
@@ -74,7 +74,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::billing_zones_history
+NGCP::Schema::Result::billing_zones_history
 
 =head1 COMPONENTS LOADED
 
@@ -86,7 +86,7 @@ NGCP::Schema::billing::Result::billing_zones_history
 
 =back
 
-=head1 TABLE: C<billing_zones_history>
+=head1 TABLE: C<billing.billing_zones_history>
 
 =head1 ACCESSORS
 
@@ -136,13 +136,13 @@ NGCP::Schema::billing::Result::billing_zones_history
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_fees_history>
+Related object: L<NGCP::Schema::Result::billing_fees_history>
 
 =head2 bz
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_zones>
+Related object: L<NGCP::Schema::Result::billing_zones>
 
 =cut
 

lib/NGCP/Schema/Result/carrier_contracts.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::contracts;
+package NGCP::Schema::Result::carrier_contracts;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contracts");
+__PACKAGE__->table("carrier.contracts");
 
 
 __PACKAGE__->add_columns(
@@ -50,7 +50,7 @@ __PACKAGE__->add_unique_constraint("externalid_idx", ["external_id"]);
 
 __PACKAGE__->has_many(
   "credits",
-  "NGCP::Schema::carrier::Result::credits",
+  "NGCP::Schema::Result::credits",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -58,7 +58,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "customer",
-  "NGCP::Schema::carrier::Result::customers",
+  "NGCP::Schema::Result::carrier_customers",
   { id => "customer_id" },
   {
     is_deferrable => 1,
@@ -71,7 +71,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "subscribers",
-  "NGCP::Schema::carrier::Result::subscribers",
+  "NGCP::Schema::Result::subscribers",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -85,7 +85,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::contracts
+NGCP::Schema::Result::carrier_contracts
 
 =head1 COMPONENTS LOADED
 
@@ -97,7 +97,7 @@ NGCP::Schema::carrier::Result::contracts
 
 =back
 
-=head1 TABLE: C<contracts>
+=head1 TABLE: C<carrier.contracts>
 
 =head1 ACCESSORS
 
@@ -157,19 +157,19 @@ NGCP::Schema::carrier::Result::contracts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::credits>
+Related object: L<NGCP::Schema::Result::credits>
 
 =head2 customer
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::customers>
+Related object: L<NGCP::Schema::Result::carrier_customers>
 
 =head2 subscribers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::subscribers>
+Related object: L<NGCP::Schema::Result::subscribers>
 
 =cut
 

lib/NGCP/Schema/Result/carrier_customers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::customers;
+package NGCP::Schema::Result::carrier_customers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("customers");
+__PACKAGE__->table("carrier.customers");
 
 
 __PACKAGE__->add_columns(
@@ -45,16 +45,16 @@ __PACKAGE__->add_unique_constraint("shopuser_idx", ["shopuser"]);
 
 
 __PACKAGE__->has_many(
-  "contracts",
-  "NGCP::Schema::carrier::Result::contracts",
+  "carrier_contracts",
+  "NGCP::Schema::Result::carrier_contracts",
   { "foreign.customer_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
 
 __PACKAGE__->has_many(
-  "orders",
-  "NGCP::Schema::carrier::Result::orders",
+  "carrier_orders",
+  "NGCP::Schema::Result::carrier_orders",
   { "foreign.customer_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -68,7 +68,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::customers
+NGCP::Schema::Result::carrier_customers
 
 =head1 COMPONENTS LOADED
 
@@ -80,7 +80,7 @@ NGCP::Schema::carrier::Result::customers
 
 =back
 
-=head1 TABLE: C<customers>
+=head1 TABLE: C<carrier.customers>
 
 =head1 ACCESSORS
 
@@ -137,17 +137,17 @@ NGCP::Schema::carrier::Result::customers
 
 =head1 RELATIONS
 
-=head2 contracts
+=head2 carrier_contracts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::contracts>
+Related object: L<NGCP::Schema::Result::carrier_contracts>
 
-=head2 orders
+=head2 carrier_orders
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::orders>
+Related object: L<NGCP::Schema::Result::carrier_orders>
 
 =cut
 

lib/NGCP/Schema/Result/carrier_orders.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::orders;
+package NGCP::Schema::Result::carrier_orders;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("orders");
+__PACKAGE__->table("carrier.orders");
 
 
 __PACKAGE__->add_columns(
@@ -41,15 +41,15 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "customer",
-  "NGCP::Schema::carrier::Result::customers",
+  "NGCP::Schema::Result::carrier_customers",
   { id => "customer_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
 __PACKAGE__->has_many(
-  "payments",
-  "NGCP::Schema::carrier::Result::payments",
+  "carrier_payments",
+  "NGCP::Schema::Result::carrier_payments",
   { "foreign.order_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -63,7 +63,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::orders
+NGCP::Schema::Result::carrier_orders
 
 =head1 COMPONENTS LOADED
 
@@ -75,7 +75,7 @@ NGCP::Schema::carrier::Result::orders
 
 =back
 
-=head1 TABLE: C<orders>
+=head1 TABLE: C<carrier.orders>
 
 =head1 ACCESSORS
 
@@ -107,13 +107,13 @@ NGCP::Schema::carrier::Result::orders
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::customers>
+Related object: L<NGCP::Schema::Result::carrier_customers>
 
-=head2 payments
+=head2 carrier_payments
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::payments>
+Related object: L<NGCP::Schema::Result::carrier_payments>
 
 =cut
 

lib/NGCP/Schema/Result/carrier_payments.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::payments;
+package NGCP::Schema::Result::carrier_payments;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("payments");
+__PACKAGE__->table("carrier.payments");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "credit",
-  "NGCP::Schema::carrier::Result::credits",
+  "NGCP::Schema::Result::credits",
   { id => "credit_id" },
   {
     is_deferrable => 1,
@@ -61,7 +61,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "order",
-  "NGCP::Schema::carrier::Result::orders",
+  "NGCP::Schema::Result::carrier_orders",
   { id => "order_id" },
   {
     is_deferrable => 1,
@@ -80,7 +80,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::payments
+NGCP::Schema::Result::carrier_payments
 
 =head1 COMPONENTS LOADED
 
@@ -92,7 +92,7 @@ NGCP::Schema::carrier::Result::payments
 
 =back
 
-=head1 TABLE: C<payments>
+=head1 TABLE: C<carrier.payments>
 
 =head1 ACCESSORS
 
@@ -131,13 +131,13 @@ NGCP::Schema::carrier::Result::payments
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::credits>
+Related object: L<NGCP::Schema::Result::credits>
 
 =head2 order
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::orders>
+Related object: L<NGCP::Schema::Result::carrier_orders>
 
 =cut
 

lib/NGCP/Schema/Result/cdr.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::accounting::Result::cdr;
+package NGCP::Schema::Result::cdr;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("cdr");
+__PACKAGE__->table("accounting.cdr");
 
 
 __PACKAGE__->add_columns(
@@ -216,7 +216,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::accounting::Result::cdr
+NGCP::Schema::Result::cdr
 
 =head1 COMPONENTS LOADED
 
@@ -228,7 +228,7 @@ NGCP::Schema::accounting::Result::cdr
 
 =back
 
-=head1 TABLE: C<cdr>
+=head1 TABLE: C<accounting.cdr>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/cfg_schema.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::ngcp::Result::cfg_schema;
+package NGCP::Schema::Result::cfg_schema;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("cfg_schema");
+__PACKAGE__->table("ngcp.cfg_schema");
 
 
 __PACKAGE__->add_columns(
@@ -54,7 +54,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::ngcp::Result::cfg_schema
+NGCP::Schema::Result::cfg_schema
 
 =head1 COMPONENTS LOADED
 
@@ -66,7 +66,7 @@ NGCP::Schema::ngcp::Result::cfg_schema
 
 =back
 
-=head1 TABLE: C<cfg_schema>
+=head1 TABLE: C<ngcp.cfg_schema>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/contacts.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::contacts;
+package NGCP::Schema::Result::contacts;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contacts");
+__PACKAGE__->table("billing.contacts");
 
 
 __PACKAGE__->add_columns(
@@ -80,7 +80,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->has_many(
   "contracts",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { "foreign.contact_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -88,7 +88,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "customers_comm_contacts",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { "foreign.comm_contact_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -96,7 +96,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "customers_contacts",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { "foreign.contact_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -104,7 +104,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "customers_tech_contacts",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { "foreign.tech_contact_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -112,7 +112,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "orders",
-  "NGCP::Schema::billing::Result::orders",
+  "NGCP::Schema::Result::orders",
   { "foreign.delivery_contact_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -126,7 +126,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::contacts
+NGCP::Schema::Result::contacts
 
 =head1 COMPONENTS LOADED
 
@@ -138,7 +138,7 @@ NGCP::Schema::billing::Result::contacts
 
 =back
 
-=head1 TABLE: C<contacts>
+=head1 TABLE: C<billing.contacts>
 
 =head1 ACCESSORS
 
@@ -260,31 +260,31 @@ NGCP::Schema::billing::Result::contacts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 customers_comm_contacts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =head2 customers_contacts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =head2 customers_tech_contacts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =head2 orders
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::orders>
+Related object: L<NGCP::Schema::Result::orders>
 
 =cut
 

lib/NGCP/Schema/Result/contract_balances.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::contract_balances;
+package NGCP::Schema::Result::contract_balances;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contract_balances");
+__PACKAGE__->table("billing.contract_balances");
 
 
 __PACKAGE__->add_columns(
@@ -68,7 +68,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -76,7 +76,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "contract_credits",
-  "NGCP::Schema::billing::Result::contract_credits",
+  "NGCP::Schema::Result::contract_credits",
   { "foreign.balance_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -84,7 +84,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "invoice",
-  "NGCP::Schema::billing::Result::invoices",
+  "NGCP::Schema::Result::invoices",
   { id => "invoice_id" },
   {
     is_deferrable => 1,
@@ -103,7 +103,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::contract_balances
+NGCP::Schema::Result::contract_balances
 
 =head1 COMPONENTS LOADED
 
@@ -115,7 +115,7 @@ NGCP::Schema::billing::Result::contract_balances
 
 =back
 
-=head1 TABLE: C<contract_balances>
+=head1 TABLE: C<billing.contract_balances>
 
 =head1 ACCESSORS
 
@@ -188,19 +188,19 @@ NGCP::Schema::billing::Result::contract_balances
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 contract_credits
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contract_credits>
+Related object: L<NGCP::Schema::Result::contract_credits>
 
 =head2 invoice
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::invoices>
+Related object: L<NGCP::Schema::Result::invoices>
 
 =cut
 

lib/NGCP/Schema/Result/contract_credits.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::contract_credits;
+package NGCP::Schema::Result::contract_credits;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contract_credits");
+__PACKAGE__->table("billing.contract_credits");
 
 
 __PACKAGE__->add_columns(
@@ -66,7 +66,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "balance",
-  "NGCP::Schema::billing::Result::contract_balances",
+  "NGCP::Schema::Result::contract_balances",
   { id => "balance_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -74,7 +74,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "credit_payments",
-  "NGCP::Schema::billing::Result::credit_payments",
+  "NGCP::Schema::Result::credit_payments",
   { "foreign.credit_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -88,7 +88,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::contract_credits
+NGCP::Schema::Result::contract_credits
 
 =head1 COMPONENTS LOADED
 
@@ -100,7 +100,7 @@ NGCP::Schema::billing::Result::contract_credits
 
 =back
 
-=head1 TABLE: C<contract_credits>
+=head1 TABLE: C<billing.contract_credits>
 
 =head1 ACCESSORS
 
@@ -163,13 +163,13 @@ NGCP::Schema::billing::Result::contract_credits
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contract_balances>
+Related object: L<NGCP::Schema::Result::contract_balances>
 
 =head2 credit_payments
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::credit_payments>
+Related object: L<NGCP::Schema::Result::credit_payments>
 
 =cut
 

lib/NGCP/Schema/Result/contract_fraud_preferences.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::contract_fraud_preferences;
+package NGCP::Schema::Result::contract_fraud_preferences;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contract_fraud_preferences");
+__PACKAGE__->table("billing.contract_fraud_preferences");
 
 
 __PACKAGE__->add_columns(
@@ -56,7 +56,7 @@ __PACKAGE__->add_unique_constraint("contract_id", ["contract_id"]);
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -70,7 +70,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::contract_fraud_preferences
+NGCP::Schema::Result::contract_fraud_preferences
 
 =head1 COMPONENTS LOADED
 
@@ -82,7 +82,7 @@ NGCP::Schema::billing::Result::contract_fraud_preferences
 
 =back
 
-=head1 TABLE: C<contract_fraud_preferences>
+=head1 TABLE: C<billing.contract_fraud_preferences>
 
 =head1 ACCESSORS
 
@@ -160,7 +160,7 @@ NGCP::Schema::billing::Result::contract_fraud_preferences
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =cut
 

lib/NGCP/Schema/Result/contract_registers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::contract_registers;
+package NGCP::Schema::Result::contract_registers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contract_registers");
+__PACKAGE__->table("billing.contract_registers");
 
 
 __PACKAGE__->add_columns(
@@ -47,7 +47,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -61,7 +61,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::contract_registers
+NGCP::Schema::Result::contract_registers
 
 =head1 COMPONENTS LOADED
 
@@ -73,7 +73,7 @@ NGCP::Schema::billing::Result::contract_registers
 
 =back
 
-=head1 TABLE: C<contract_registers>
+=head1 TABLE: C<billing.contract_registers>
 
 =head1 ACCESSORS
 
@@ -122,7 +122,7 @@ NGCP::Schema::billing::Result::contract_registers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =cut
 

lib/NGCP/Schema/Result/contracts.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::contracts;
+package NGCP::Schema::Result::contracts;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("contracts");
+__PACKAGE__->table("billing.contracts");
 
 
 __PACKAGE__->add_columns(
@@ -97,7 +97,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->might_have(
   "active_reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -105,7 +105,7 @@ __PACKAGE__->might_have(
 
 __PACKAGE__->has_many(
   "billing_mappings",
-  "NGCP::Schema::billing::Result::billing_mappings",
+  "NGCP::Schema::Result::billing_mappings",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -113,7 +113,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "contact",
-  "NGCP::Schema::billing::Result::contacts",
+  "NGCP::Schema::Result::contacts",
   { id => "contact_id" },
   {
     is_deferrable => 1,
@@ -126,7 +126,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "contract_balances",
-  "NGCP::Schema::billing::Result::contract_balances",
+  "NGCP::Schema::Result::contract_balances",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -134,7 +134,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->might_have(
   "contract_fraud_preference",
-  "NGCP::Schema::billing::Result::contract_fraud_preferences",
+  "NGCP::Schema::Result::contract_fraud_preferences",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -142,7 +142,7 @@ __PACKAGE__->might_have(
 
 __PACKAGE__->has_many(
   "contract_registers",
-  "NGCP::Schema::billing::Result::contract_registers",
+  "NGCP::Schema::Result::contract_registers",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -150,7 +150,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "customer",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { id => "customer_id" },
   {
     is_deferrable => 1,
@@ -163,7 +163,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "order",
-  "NGCP::Schema::billing::Result::orders",
+  "NGCP::Schema::Result::orders",
   { id => "order_id" },
   {
     is_deferrable => 1,
@@ -176,7 +176,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -189,7 +189,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "voip_subscribers",
-  "NGCP::Schema::billing::Result::voip_subscribers",
+  "NGCP::Schema::Result::voip_subscribers",
   { "foreign.contract_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -203,7 +203,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::contracts
+NGCP::Schema::Result::contracts
 
 =head1 COMPONENTS LOADED
 
@@ -215,7 +215,7 @@ NGCP::Schema::billing::Result::contracts
 
 =back
 
-=head1 TABLE: C<contracts>
+=head1 TABLE: C<billing.contracts>
 
 =head1 ACCESSORS
 
@@ -307,61 +307,61 @@ NGCP::Schema::billing::Result::contracts
 
 Type: might_have
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =head2 billing_mappings
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_mappings>
+Related object: L<NGCP::Schema::Result::billing_mappings>
 
 =head2 contact
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contacts>
+Related object: L<NGCP::Schema::Result::contacts>
 
 =head2 contract_balances
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contract_balances>
+Related object: L<NGCP::Schema::Result::contract_balances>
 
 =head2 contract_fraud_preference
 
 Type: might_have
 
-Related object: L<NGCP::Schema::billing::Result::contract_fraud_preferences>
+Related object: L<NGCP::Schema::Result::contract_fraud_preferences>
 
 =head2 contract_registers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contract_registers>
+Related object: L<NGCP::Schema::Result::contract_registers>
 
 =head2 customer
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =head2 order
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::orders>
+Related object: L<NGCP::Schema::Result::orders>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =head2 voip_subscribers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::voip_subscribers>
+Related object: L<NGCP::Schema::Result::voip_subscribers>
 
 =cut
 

lib/NGCP/Schema/Result/credit_payments.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::credit_payments;
+package NGCP::Schema::Result::credit_payments;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("credit_payments");
+__PACKAGE__->table("billing.credit_payments");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "credit",
-  "NGCP::Schema::billing::Result::contract_credits",
+  "NGCP::Schema::Result::contract_credits",
   { id => "credit_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -56,7 +56,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "payment",
-  "NGCP::Schema::billing::Result::payments",
+  "NGCP::Schema::Result::payments",
   { id => "payment_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -70,7 +70,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::credit_payments
+NGCP::Schema::Result::credit_payments
 
 =head1 COMPONENTS LOADED
 
@@ -82,7 +82,7 @@ NGCP::Schema::billing::Result::credit_payments
 
 =back
 
-=head1 TABLE: C<credit_payments>
+=head1 TABLE: C<billing.credit_payments>
 
 =head1 ACCESSORS
 
@@ -121,13 +121,13 @@ NGCP::Schema::billing::Result::credit_payments
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contract_credits>
+Related object: L<NGCP::Schema::Result::contract_credits>
 
 =head2 payment
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::payments>
+Related object: L<NGCP::Schema::Result::payments>
 
 =cut
 

lib/NGCP/Schema/Result/credits.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::credits;
+package NGCP::Schema::Result::credits;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("credits");
+__PACKAGE__->table("carrier.credits");
 
 
 __PACKAGE__->add_columns(
@@ -41,15 +41,15 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::carrier::Result::contracts",
+  "NGCP::Schema::Result::carrier_contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
 __PACKAGE__->has_many(
-  "payments",
-  "NGCP::Schema::carrier::Result::payments",
+  "carrier_payments",
+  "NGCP::Schema::Result::carrier_payments",
   { "foreign.credit_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -63,7 +63,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::credits
+NGCP::Schema::Result::credits
 
 =head1 COMPONENTS LOADED
 
@@ -75,7 +75,7 @@ NGCP::Schema::carrier::Result::credits
 
 =back
 
-=head1 TABLE: C<credits>
+=head1 TABLE: C<carrier.credits>
 
 =head1 ACCESSORS
 
@@ -107,13 +107,13 @@ NGCP::Schema::carrier::Result::credits
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::contracts>
+Related object: L<NGCP::Schema::Result::carrier_contracts>
 
-=head2 payments
+=head2 carrier_payments
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::payments>
+Related object: L<NGCP::Schema::Result::carrier_payments>
 
 =cut
 

lib/NGCP/Schema/Result/customer_registers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::customer_registers;
+package NGCP::Schema::Result::customer_registers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("customer_registers");
+__PACKAGE__->table("billing.customer_registers");
 
 
 __PACKAGE__->add_columns(
@@ -47,7 +47,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "customer",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { id => "customer_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -61,7 +61,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::customer_registers
+NGCP::Schema::Result::customer_registers
 
 =head1 COMPONENTS LOADED
 
@@ -73,7 +73,7 @@ NGCP::Schema::billing::Result::customer_registers
 
 =back
 
-=head1 TABLE: C<customer_registers>
+=head1 TABLE: C<billing.customer_registers>
 
 =head1 ACCESSORS
 
@@ -122,7 +122,7 @@ NGCP::Schema::billing::Result::customer_registers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =cut
 

lib/NGCP/Schema/Result/customers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::customers;
+package NGCP::Schema::Result::customers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("customers");
+__PACKAGE__->table("billing.customers");
 
 
 __PACKAGE__->add_columns(
@@ -87,7 +87,7 @@ __PACKAGE__->add_unique_constraint("reseller_id", ["reseller_id", "shopuser"]);
 
 __PACKAGE__->belongs_to(
   "comm_contact",
-  "NGCP::Schema::billing::Result::contacts",
+  "NGCP::Schema::Result::contacts",
   { id => "comm_contact_id" },
   {
     is_deferrable => 1,
@@ -100,7 +100,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "contact",
-  "NGCP::Schema::billing::Result::contacts",
+  "NGCP::Schema::Result::contacts",
   { id => "contact_id" },
   {
     is_deferrable => 1,
@@ -113,7 +113,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "contracts",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { "foreign.customer_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -121,7 +121,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "customer_registers",
-  "NGCP::Schema::billing::Result::customer_registers",
+  "NGCP::Schema::Result::customer_registers",
   { "foreign.customer_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -129,7 +129,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "orders",
-  "NGCP::Schema::billing::Result::orders",
+  "NGCP::Schema::Result::orders",
   { "foreign.customer_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -137,7 +137,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -150,7 +150,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "tech_contact",
-  "NGCP::Schema::billing::Result::contacts",
+  "NGCP::Schema::Result::contacts",
   { id => "tech_contact_id" },
   {
     is_deferrable => 1,
@@ -169,7 +169,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::customers
+NGCP::Schema::Result::customers
 
 =head1 COMPONENTS LOADED
 
@@ -181,7 +181,7 @@ NGCP::Schema::billing::Result::customers
 
 =back
 
-=head1 TABLE: C<customers>
+=head1 TABLE: C<billing.customers>
 
 =head1 ACCESSORS
 
@@ -284,43 +284,43 @@ NGCP::Schema::billing::Result::customers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contacts>
+Related object: L<NGCP::Schema::Result::contacts>
 
 =head2 contact
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contacts>
+Related object: L<NGCP::Schema::Result::contacts>
 
 =head2 contracts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 customer_registers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::customer_registers>
+Related object: L<NGCP::Schema::Result::customer_registers>
 
 =head2 orders
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::orders>
+Related object: L<NGCP::Schema::Result::orders>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =head2 tech_contact
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contacts>
+Related object: L<NGCP::Schema::Result::contacts>
 
 =cut
 

lib/NGCP/Schema/Result/db_schema.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::ngcp::Result::db_schema;
+package NGCP::Schema::Result::db_schema;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("db_schema");
+__PACKAGE__->table("ngcp.db_schema");
 
 
 __PACKAGE__->add_columns(
@@ -54,7 +54,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::ngcp::Result::db_schema
+NGCP::Schema::Result::db_schema
 
 =head1 COMPONENTS LOADED
 
@@ -66,7 +66,7 @@ NGCP::Schema::ngcp::Result::db_schema
 
 =back
 
-=head1 TABLE: C<db_schema>
+=head1 TABLE: C<ngcp.db_schema>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/dbaliases.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::dbaliases;
+package NGCP::Schema::Result::dbaliases;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("dbaliases");
+__PACKAGE__->table("kamailio.dbaliases");
 
 
 __PACKAGE__->add_columns(
@@ -51,7 +51,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::dbaliases
+NGCP::Schema::Result::dbaliases
 
 =head1 COMPONENTS LOADED
 
@@ -63,7 +63,7 @@ NGCP::Schema::kamailio::Result::dbaliases
 
 =back
 
-=head1 TABLE: C<dbaliases>
+=head1 TABLE: C<kamailio.dbaliases>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/dialog.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::dialog;
+package NGCP::Schema::Result::dialog;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("dialog");
+__PACKAGE__->table("kamailio.dialog");
 
 
 __PACKAGE__->add_columns(
@@ -101,7 +101,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::dialog
+NGCP::Schema::Result::dialog
 
 =head1 COMPONENTS LOADED
 
@@ -113,7 +113,7 @@ NGCP::Schema::kamailio::Result::dialog
 
 =back
 
-=head1 TABLE: C<dialog>
+=head1 TABLE: C<kamailio.dialog>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/dialog_vars.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::dialog_vars;
+package NGCP::Schema::Result::dialog_vars;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("dialog_vars");
+__PACKAGE__->table("kamailio.dialog_vars");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::dialog_vars
+NGCP::Schema::Result::dialog_vars
 
 =head1 COMPONENTS LOADED
 
@@ -60,7 +60,7 @@ NGCP::Schema::kamailio::Result::dialog_vars
 
 =back
 
-=head1 TABLE: C<dialog_vars>
+=head1 TABLE: C<kamailio.dialog_vars>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/dialplan.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::dialplan;
+package NGCP::Schema::Result::dialplan;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("dialplan");
+__PACKAGE__->table("kamailio.dialplan");
 
 
 __PACKAGE__->add_columns(
@@ -56,7 +56,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::dialplan
+NGCP::Schema::Result::dialplan
 
 =head1 COMPONENTS LOADED
 
@@ -68,7 +68,7 @@ NGCP::Schema::kamailio::Result::dialplan
 
 =back
 
-=head1 TABLE: C<dialplan>
+=head1 TABLE: C<kamailio.dialplan>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/dispatcher.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::dispatcher;
+package NGCP::Schema::Result::dispatcher;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("dispatcher");
+__PACKAGE__->table("kamailio.dispatcher");
 
 
 __PACKAGE__->add_columns(
@@ -52,7 +52,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::dispatcher
+NGCP::Schema::Result::dispatcher
 
 =head1 COMPONENTS LOADED
 
@@ -64,7 +64,7 @@ NGCP::Schema::kamailio::Result::dispatcher
 
 =back
 
-=head1 TABLE: C<dispatcher>
+=head1 TABLE: C<kamailio.dispatcher>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/dom_preferences.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::dom_preferences;
+package NGCP::Schema::Result::dom_preferences;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("dom_preferences");
+__PACKAGE__->table("kamailio.dom_preferences");
 
 
 __PACKAGE__->add_columns(
@@ -59,7 +59,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::dom_preferences
+NGCP::Schema::Result::dom_preferences
 
 =head1 COMPONENTS LOADED
 
@@ -71,7 +71,7 @@ NGCP::Schema::kamailio::Result::dom_preferences
 
 =back
 
-=head1 TABLE: C<dom_preferences>
+=head1 TABLE: C<kamailio.dom_preferences>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/domain.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::domain;
+package NGCP::Schema::Result::domain;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("domain");
+__PACKAGE__->table("kamailio.domain");
 
 
 __PACKAGE__->add_columns(
@@ -54,7 +54,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::domain
+NGCP::Schema::Result::domain
 
 =head1 COMPONENTS LOADED
 
@@ -66,7 +66,7 @@ NGCP::Schema::kamailio::Result::domain
 
 =back
 
-=head1 TABLE: C<domain>
+=head1 TABLE: C<kamailio.domain>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/domain_attrs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::domain_attrs;
+package NGCP::Schema::Result::domain_attrs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("domain_attrs");
+__PACKAGE__->table("kamailio.domain_attrs");
 
 
 __PACKAGE__->add_columns(
@@ -58,7 +58,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::domain_attrs
+NGCP::Schema::Result::domain_attrs
 
 =head1 COMPONENTS LOADED
 
@@ -70,7 +70,7 @@ NGCP::Schema::kamailio::Result::domain_attrs
 
 =back
 
-=head1 TABLE: C<domain_attrs>
+=head1 TABLE: C<kamailio.domain_attrs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/domain_resellers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::domain_resellers;
+package NGCP::Schema::Result::domain_resellers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("domain_resellers");
+__PACKAGE__->table("billing.domain_resellers");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "domain",
-  "NGCP::Schema::billing::Result::domains",
+  "NGCP::Schema::Result::domains",
   { id => "domain_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -56,7 +56,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -70,7 +70,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::domain_resellers
+NGCP::Schema::Result::domain_resellers
 
 =head1 COMPONENTS LOADED
 
@@ -82,7 +82,7 @@ NGCP::Schema::billing::Result::domain_resellers
 
 =back
 
-=head1 TABLE: C<domain_resellers>
+=head1 TABLE: C<billing.domain_resellers>
 
 =head1 ACCESSORS
 
@@ -121,13 +121,13 @@ NGCP::Schema::billing::Result::domain_resellers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::domains>
+Related object: L<NGCP::Schema::Result::domains>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =cut
 

lib/NGCP/Schema/Result/domains.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::domains;
+package NGCP::Schema::Result::domains;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("domains");
+__PACKAGE__->table("billing.domains");
 
 
 __PACKAGE__->add_columns(
@@ -39,7 +39,7 @@ __PACKAGE__->add_unique_constraint("domain_idx", ["domain"]);
 
 __PACKAGE__->has_many(
   "domain_resellers",
-  "NGCP::Schema::billing::Result::domain_resellers",
+  "NGCP::Schema::Result::domain_resellers",
   { "foreign.domain_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -47,7 +47,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_subscribers",
-  "NGCP::Schema::billing::Result::voip_subscribers",
+  "NGCP::Schema::Result::voip_subscribers",
   { "foreign.domain_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -61,7 +61,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::domains
+NGCP::Schema::Result::domains
 
 =head1 COMPONENTS LOADED
 
@@ -73,7 +73,7 @@ NGCP::Schema::billing::Result::domains
 
 =back
 
-=head1 TABLE: C<domains>
+=head1 TABLE: C<billing.domains>
 
 =head1 ACCESSORS
 
@@ -114,13 +114,13 @@ NGCP::Schema::billing::Result::domains
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::domain_resellers>
+Related object: L<NGCP::Schema::Result::domain_resellers>
 
 =head2 voip_subscribers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::voip_subscribers>
+Related object: L<NGCP::Schema::Result::voip_subscribers>
 
 =cut
 

lib/NGCP/Schema/Result/fax_destinations.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::fax_destinations;
+package NGCP::Schema::Result::fax_destinations;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("fax_destinations");
+__PACKAGE__->table("kamailio.fax_destinations");
 
 
 __PACKAGE__->add_columns(
@@ -79,7 +79,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::fax_destinations
+NGCP::Schema::Result::fax_destinations
 
 =head1 COMPONENTS LOADED
 
@@ -91,7 +91,7 @@ NGCP::Schema::kamailio::Result::fax_destinations
 
 =back
 
-=head1 TABLE: C<fax_destinations>
+=head1 TABLE: C<kamailio.fax_destinations>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/fax_journal.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::fax_journal;
+package NGCP::Schema::Result::fax_journal;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("fax_journal");
+__PACKAGE__->table("kamailio.fax_journal");
 
 
 __PACKAGE__->add_columns(
@@ -94,7 +94,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::fax_journal
+NGCP::Schema::Result::fax_journal
 
 =head1 COMPONENTS LOADED
 
@@ -106,7 +106,7 @@ NGCP::Schema::kamailio::Result::fax_journal
 
 =back
 
-=head1 TABLE: C<fax_journal>
+=head1 TABLE: C<kamailio.fax_journal>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/fax_preferences.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::fax_preferences;
+package NGCP::Schema::Result::fax_preferences;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("fax_preferences");
+__PACKAGE__->table("kamailio.fax_preferences");
 
 
 __PACKAGE__->add_columns(
@@ -67,7 +67,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::fax_preferences
+NGCP::Schema::Result::fax_preferences
 
 =head1 COMPONENTS LOADED
 
@@ -79,7 +79,7 @@ NGCP::Schema::kamailio::Result::fax_preferences
 
 =back
 
-=head1 TABLE: C<fax_preferences>
+=head1 TABLE: C<kamailio.fax_preferences>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/htable.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::htable;
+package NGCP::Schema::Result::htable;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("htable");
+__PACKAGE__->table("kamailio.htable");
 
 
 __PACKAGE__->add_columns(
@@ -50,7 +50,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::htable
+NGCP::Schema::Result::htable
 
 =head1 COMPONENTS LOADED
 
@@ -62,7 +62,7 @@ NGCP::Schema::kamailio::Result::htable
 
 =back
 
-=head1 TABLE: C<htable>
+=head1 TABLE: C<kamailio.htable>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/interceptions.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::interceptions;
+package NGCP::Schema::Result::interceptions;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("interceptions");
+__PACKAGE__->table("carrier.interceptions");
 
 
 __PACKAGE__->add_columns(
@@ -42,7 +42,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::interceptions
+NGCP::Schema::Result::interceptions
 
 =head1 COMPONENTS LOADED
 
@@ -54,7 +54,7 @@ NGCP::Schema::carrier::Result::interceptions
 
 =back
 
-=head1 TABLE: C<interceptions>
+=head1 TABLE: C<carrier.interceptions>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/invoices.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::invoices;
+package NGCP::Schema::Result::invoices;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("invoices");
+__PACKAGE__->table("billing.invoices");
 
 
 __PACKAGE__->add_columns(
@@ -45,7 +45,7 @@ __PACKAGE__->add_unique_constraint("yms_idx", ["year", "month", "serial"]);
 
 __PACKAGE__->has_many(
   "contract_balances",
-  "NGCP::Schema::billing::Result::contract_balances",
+  "NGCP::Schema::Result::contract_balances",
   { "foreign.invoice_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -53,7 +53,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "orders",
-  "NGCP::Schema::billing::Result::orders",
+  "NGCP::Schema::Result::orders",
   { "foreign.invoice_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -67,7 +67,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::invoices
+NGCP::Schema::Result::invoices
 
 =head1 COMPONENTS LOADED
 
@@ -79,7 +79,7 @@ NGCP::Schema::billing::Result::invoices
 
 =back
 
-=head1 TABLE: C<invoices>
+=head1 TABLE: C<billing.invoices>
 
 =head1 ACCESSORS
 
@@ -141,13 +141,13 @@ NGCP::Schema::billing::Result::invoices
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contract_balances>
+Related object: L<NGCP::Schema::Result::contract_balances>
 
 =head2 orders
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::orders>
+Related object: L<NGCP::Schema::Result::orders>
 
 =cut
 

lib/NGCP/Schema/Result/kamailio_acc.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::acc;
+package NGCP::Schema::Result::kamailio_acc;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("acc");
+__PACKAGE__->table("kamailio.acc");
 
 
 __PACKAGE__->add_columns(
@@ -81,7 +81,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::acc
+NGCP::Schema::Result::kamailio_acc
 
 =head1 COMPONENTS LOADED
 
@@ -93,7 +93,7 @@ NGCP::Schema::kamailio::Result::acc
 
 =back
 
-=head1 TABLE: C<acc>
+=head1 TABLE: C<kamailio.acc>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/kamailio_acc_backup.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::acc_backup;
+package NGCP::Schema::Result::kamailio_acc_backup;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("acc_backup");
+__PACKAGE__->table("kamailio.acc_backup");
 
 
 __PACKAGE__->add_columns(
@@ -81,7 +81,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::acc_backup
+NGCP::Schema::Result::kamailio_acc_backup
 
 =head1 COMPONENTS LOADED
 
@@ -93,7 +93,7 @@ NGCP::Schema::kamailio::Result::acc_backup
 
 =back
 
-=head1 TABLE: C<acc_backup>
+=head1 TABLE: C<kamailio.acc_backup>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/kamailio_acc_trash.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::acc_trash;
+package NGCP::Schema::Result::kamailio_acc_trash;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("acc_trash");
+__PACKAGE__->table("kamailio.acc_trash");
 
 
 __PACKAGE__->add_columns(
@@ -81,7 +81,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::acc_trash
+NGCP::Schema::Result::kamailio_acc_trash
 
 =head1 COMPONENTS LOADED
 
@@ -93,7 +93,7 @@ NGCP::Schema::kamailio::Result::acc_trash
 
 =back
 
-=head1 TABLE: C<acc_trash>
+=head1 TABLE: C<kamailio.acc_trash>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/language_strings.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::provisioning::Result::language_strings;
+package NGCP::Schema::Result::language_strings;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("language_strings");
+__PACKAGE__->table("provisioning.language_strings");
 
 
 __PACKAGE__->add_columns(
@@ -49,7 +49,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::provisioning::Result::language_strings
+NGCP::Schema::Result::language_strings
 
 =head1 COMPONENTS LOADED
 
@@ -61,7 +61,7 @@ NGCP::Schema::provisioning::Result::language_strings
 
 =back
 
-=head1 TABLE: C<language_strings>
+=head1 TABLE: C<provisioning.language_strings>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/lcr_gw.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::lcr_gw;
+package NGCP::Schema::Result::lcr_gw;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("lcr_gw");
+__PACKAGE__->table("kamailio.lcr_gw");
 
 
 __PACKAGE__->add_columns(
@@ -73,7 +73,7 @@ __PACKAGE__->add_unique_constraint("lcr_id_ip_addr_idx", ["lcr_id", "ip_addr"]);
 
 __PACKAGE__->has_many(
   "lcr_rule_targets",
-  "NGCP::Schema::kamailio::Result::lcr_rule_target",
+  "NGCP::Schema::Result::lcr_rule_target",
   { "foreign.gw_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -87,7 +87,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::lcr_gw
+NGCP::Schema::Result::lcr_gw
 
 =head1 COMPONENTS LOADED
 
@@ -99,7 +99,7 @@ NGCP::Schema::kamailio::Result::lcr_gw
 
 =back
 
-=head1 TABLE: C<lcr_gw>
+=head1 TABLE: C<kamailio.lcr_gw>
 
 =head1 ACCESSORS
 
@@ -231,7 +231,7 @@ NGCP::Schema::kamailio::Result::lcr_gw
 
 Type: has_many
 
-Related object: L<NGCP::Schema::kamailio::Result::lcr_rule_target>
+Related object: L<NGCP::Schema::Result::lcr_rule_target>
 
 =cut
 

lib/NGCP/Schema/Result/lcr_rule.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::lcr_rule;
+package NGCP::Schema::Result::lcr_rule;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("lcr_rule");
+__PACKAGE__->table("kamailio.lcr_rule");
 
 
 __PACKAGE__->add_columns(
@@ -64,7 +64,7 @@ __PACKAGE__->add_unique_constraint(
 
 __PACKAGE__->has_many(
   "lcr_rule_targets",
-  "NGCP::Schema::kamailio::Result::lcr_rule_target",
+  "NGCP::Schema::Result::lcr_rule_target",
   { "foreign.rule_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -78,7 +78,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::lcr_rule
+NGCP::Schema::Result::lcr_rule
 
 =head1 COMPONENTS LOADED
 
@@ -90,7 +90,7 @@ NGCP::Schema::kamailio::Result::lcr_rule
 
 =back
 
-=head1 TABLE: C<lcr_rule>
+=head1 TABLE: C<kamailio.lcr_rule>
 
 =head1 ACCESSORS
 
@@ -178,7 +178,7 @@ NGCP::Schema::kamailio::Result::lcr_rule
 
 Type: has_many
 
-Related object: L<NGCP::Schema::kamailio::Result::lcr_rule_target>
+Related object: L<NGCP::Schema::Result::lcr_rule_target>
 
 =cut
 

lib/NGCP/Schema/Result/lcr_rule_target.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::lcr_rule_target;
+package NGCP::Schema::Result::lcr_rule_target;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("lcr_rule_target");
+__PACKAGE__->table("kamailio.lcr_rule_target");
 
 
 __PACKAGE__->add_columns(
@@ -62,7 +62,7 @@ __PACKAGE__->add_unique_constraint("rule_id_gw_id_idx", ["rule_id", "gw_id"]);
 
 __PACKAGE__->belongs_to(
   "gw",
-  "NGCP::Schema::kamailio::Result::lcr_gw",
+  "NGCP::Schema::Result::lcr_gw",
   { id => "gw_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -70,7 +70,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "rule",
-  "NGCP::Schema::kamailio::Result::lcr_rule",
+  "NGCP::Schema::Result::lcr_rule",
   { id => "rule_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -84,7 +84,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::lcr_rule_target
+NGCP::Schema::Result::lcr_rule_target
 
 =head1 COMPONENTS LOADED
 
@@ -96,7 +96,7 @@ NGCP::Schema::kamailio::Result::lcr_rule_target
 
 =back
 
-=head1 TABLE: C<lcr_rule_target>
+=head1 TABLE: C<kamailio.lcr_rule_target>
 
 =head1 ACCESSORS
 
@@ -166,13 +166,13 @@ NGCP::Schema::kamailio::Result::lcr_rule_target
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::kamailio::Result::lcr_gw>
+Related object: L<NGCP::Schema::Result::lcr_gw>
 
 =head2 rule
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::kamailio::Result::lcr_rule>
+Related object: L<NGCP::Schema::Result::lcr_rule>
 
 =cut
 

lib/NGCP/Schema/Result/lnp_numbers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::lnp_numbers;
+package NGCP::Schema::Result::lnp_numbers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("lnp_numbers");
+__PACKAGE__->table("billing.lnp_numbers");
 
 
 __PACKAGE__->add_columns(
@@ -55,7 +55,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "lnp_provider",
-  "NGCP::Schema::billing::Result::lnp_providers",
+  "NGCP::Schema::Result::lnp_providers",
   { id => "lnp_provider_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -69,7 +69,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::lnp_numbers
+NGCP::Schema::Result::lnp_numbers
 
 =head1 COMPONENTS LOADED
 
@@ -81,7 +81,7 @@ NGCP::Schema::billing::Result::lnp_numbers
 
 =back
 
-=head1 TABLE: C<lnp_numbers>
+=head1 TABLE: C<billing.lnp_numbers>
 
 =head1 ACCESSORS
 
@@ -131,7 +131,7 @@ NGCP::Schema::billing::Result::lnp_numbers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::lnp_providers>
+Related object: L<NGCP::Schema::Result::lnp_providers>
 
 =cut
 

lib/NGCP/Schema/Result/lnp_providers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::lnp_providers;
+package NGCP::Schema::Result::lnp_providers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("lnp_providers");
+__PACKAGE__->table("billing.lnp_providers");
 
 
 __PACKAGE__->add_columns(
@@ -31,7 +31,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->has_many(
   "lnp_numbers",
-  "NGCP::Schema::billing::Result::lnp_numbers",
+  "NGCP::Schema::Result::lnp_numbers",
   { "foreign.lnp_provider_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -39,7 +39,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "ncos_lnp_lists",
-  "NGCP::Schema::billing::Result::ncos_lnp_list",
+  "NGCP::Schema::Result::ncos_lnp_list",
   { "foreign.lnp_provider_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -53,7 +53,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::lnp_providers
+NGCP::Schema::Result::lnp_providers
 
 =head1 COMPONENTS LOADED
 
@@ -65,7 +65,7 @@ NGCP::Schema::billing::Result::lnp_providers
 
 =back
 
-=head1 TABLE: C<lnp_providers>
+=head1 TABLE: C<billing.lnp_providers>
 
 =head1 ACCESSORS
 
@@ -95,13 +95,13 @@ NGCP::Schema::billing::Result::lnp_providers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::lnp_numbers>
+Related object: L<NGCP::Schema::Result::lnp_numbers>
 
 =head2 ncos_lnp_lists
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::ncos_lnp_list>
+Related object: L<NGCP::Schema::Result::ncos_lnp_list>
 
 =cut
 

lib/NGCP/Schema/Result/location.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::location;
+package NGCP::Schema::Result::location;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("location");
+__PACKAGE__->table("kamailio.location");
 
 
 __PACKAGE__->add_columns(
@@ -99,7 +99,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::location
+NGCP::Schema::Result::location
 
 =head1 COMPONENTS LOADED
 
@@ -111,7 +111,7 @@ NGCP::Schema::kamailio::Result::location
 
 =back
 
-=head1 TABLE: C<location>
+=head1 TABLE: C<kamailio.location>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/location_attrs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::location_attrs;
+package NGCP::Schema::Result::location_attrs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("location_attrs");
+__PACKAGE__->table("kamailio.location_attrs");
 
 
 __PACKAGE__->add_columns(
@@ -59,7 +59,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::location_attrs
+NGCP::Schema::Result::location_attrs
 
 =head1 COMPONENTS LOADED
 
@@ -71,7 +71,7 @@ NGCP::Schema::kamailio::Result::location_attrs
 
 =back
 
-=head1 TABLE: C<location_attrs>
+=head1 TABLE: C<kamailio.location_attrs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/mark.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::accounting::Result::mark;
+package NGCP::Schema::Result::mark;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("mark");
+__PACKAGE__->table("accounting.mark");
 
 
 __PACKAGE__->add_columns(
@@ -44,7 +44,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::accounting::Result::mark
+NGCP::Schema::Result::mark
 
 =head1 COMPONENTS LOADED
 
@@ -56,7 +56,7 @@ NGCP::Schema::accounting::Result::mark
 
 =back
 
-=head1 TABLE: C<mark>
+=head1 TABLE: C<accounting.mark>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/message_packets.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::sipstats::Result::message_packets;
+package NGCP::Schema::Result::message_packets;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("message_packets");
+__PACKAGE__->table("sipstats.message_packets");
 
 
 __PACKAGE__->add_columns(
@@ -37,7 +37,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::sipstats::Result::message_packets
+NGCP::Schema::Result::message_packets
 
 =head1 COMPONENTS LOADED
 
@@ -49,7 +49,7 @@ NGCP::Schema::sipstats::Result::message_packets
 
 =back
 
-=head1 TABLE: C<message_packets>
+=head1 TABLE: C<sipstats.message_packets>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/messages.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::sipstats::Result::messages;
+package NGCP::Schema::Result::messages;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("messages");
+__PACKAGE__->table("sipstats.messages");
 
 
 __PACKAGE__->add_columns(
@@ -83,7 +83,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::sipstats::Result::messages
+NGCP::Schema::Result::messages
 
 =head1 COMPONENTS LOADED
 
@@ -95,7 +95,7 @@ NGCP::Schema::sipstats::Result::messages
 
 =back
 
-=head1 TABLE: C<messages>
+=head1 TABLE: C<sipstats.messages>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/mobile_push_registrations.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::mobile_push_registrations;
+package NGCP::Schema::Result::mobile_push_registrations;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("mobile_push_registrations");
+__PACKAGE__->table("kamailio.mobile_push_registrations");
 
 
 __PACKAGE__->add_columns(
@@ -55,7 +55,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::mobile_push_registrations
+NGCP::Schema::Result::mobile_push_registrations
 
 =head1 COMPONENTS LOADED
 
@@ -67,7 +67,7 @@ NGCP::Schema::kamailio::Result::mobile_push_registrations
 
 =back
 
-=head1 TABLE: C<mobile_push_registrations>
+=head1 TABLE: C<kamailio.mobile_push_registrations>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/ncos_levels.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::ncos_levels;
+package NGCP::Schema::Result::ncos_levels;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("ncos_levels");
+__PACKAGE__->table("billing.ncos_levels");
 
 
 __PACKAGE__->add_columns(
@@ -57,7 +57,7 @@ __PACKAGE__->add_unique_constraint("reslev_idx", ["reseller_id", "level"]);
 
 __PACKAGE__->has_many(
   "ncos_lnp_lists",
-  "NGCP::Schema::billing::Result::ncos_lnp_list",
+  "NGCP::Schema::Result::ncos_lnp_list",
   { "foreign.ncos_level_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -65,7 +65,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "ncos_pattern_lists",
-  "NGCP::Schema::billing::Result::ncos_pattern_list",
+  "NGCP::Schema::Result::ncos_pattern_list",
   { "foreign.ncos_level_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -73,7 +73,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -92,7 +92,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::ncos_levels
+NGCP::Schema::Result::ncos_levels
 
 =head1 COMPONENTS LOADED
 
@@ -104,7 +104,7 @@ NGCP::Schema::billing::Result::ncos_levels
 
 =back
 
-=head1 TABLE: C<ncos_levels>
+=head1 TABLE: C<billing.ncos_levels>
 
 =head1 ACCESSORS
 
@@ -172,19 +172,19 @@ NGCP::Schema::billing::Result::ncos_levels
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::ncos_lnp_list>
+Related object: L<NGCP::Schema::Result::ncos_lnp_list>
 
 =head2 ncos_pattern_lists
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::ncos_pattern_list>
+Related object: L<NGCP::Schema::Result::ncos_pattern_list>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =cut
 

lib/NGCP/Schema/Result/ncos_lnp_list.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::ncos_lnp_list;
+package NGCP::Schema::Result::ncos_lnp_list;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("ncos_lnp_list");
+__PACKAGE__->table("billing.ncos_lnp_list");
 
 
 __PACKAGE__->add_columns(
@@ -53,7 +53,7 @@ __PACKAGE__->add_unique_constraint("levpro_idx", ["ncos_level_id", "lnp_provider
 
 __PACKAGE__->belongs_to(
   "lnp_provider",
-  "NGCP::Schema::billing::Result::lnp_providers",
+  "NGCP::Schema::Result::lnp_providers",
   { id => "lnp_provider_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -61,7 +61,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "ncos_level",
-  "NGCP::Schema::billing::Result::ncos_levels",
+  "NGCP::Schema::Result::ncos_levels",
   { id => "ncos_level_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -75,7 +75,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::ncos_lnp_list
+NGCP::Schema::Result::ncos_lnp_list
 
 =head1 COMPONENTS LOADED
 
@@ -87,7 +87,7 @@ NGCP::Schema::billing::Result::ncos_lnp_list
 
 =back
 
-=head1 TABLE: C<ncos_lnp_list>
+=head1 TABLE: C<billing.ncos_lnp_list>
 
 =head1 ACCESSORS
 
@@ -143,13 +143,13 @@ NGCP::Schema::billing::Result::ncos_lnp_list
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::lnp_providers>
+Related object: L<NGCP::Schema::Result::lnp_providers>
 
 =head2 ncos_level
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::ncos_levels>
+Related object: L<NGCP::Schema::Result::ncos_levels>
 
 =cut
 

lib/NGCP/Schema/Result/ncos_pattern_list.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::ncos_pattern_list;
+package NGCP::Schema::Result::ncos_pattern_list;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("ncos_pattern_list");
+__PACKAGE__->table("billing.ncos_pattern_list");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ __PACKAGE__->add_unique_constraint("levpat_idx", ["ncos_level_id", "pattern"]);
 
 __PACKAGE__->belongs_to(
   "ncos_level",
-  "NGCP::Schema::billing::Result::ncos_levels",
+  "NGCP::Schema::Result::ncos_levels",
   { id => "ncos_level_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -62,7 +62,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::ncos_pattern_list
+NGCP::Schema::Result::ncos_pattern_list
 
 =head1 COMPONENTS LOADED
 
@@ -74,7 +74,7 @@ NGCP::Schema::billing::Result::ncos_pattern_list
 
 =back
 
-=head1 TABLE: C<ncos_pattern_list>
+=head1 TABLE: C<billing.ncos_pattern_list>
 
 =head1 ACCESSORS
 
@@ -129,7 +129,7 @@ NGCP::Schema::billing::Result::ncos_pattern_list
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::ncos_levels>
+Related object: L<NGCP::Schema::Result::ncos_levels>
 
 =cut
 

lib/NGCP/Schema/Result/numbers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::numbers;
+package NGCP::Schema::Result::numbers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("numbers");
+__PACKAGE__->table("carrier.numbers");
 
 
 __PACKAGE__->add_columns(
@@ -36,7 +36,7 @@ __PACKAGE__->set_primary_key("number");
 
 __PACKAGE__->belongs_to(
   "subscriber",
-  "NGCP::Schema::carrier::Result::subscribers",
+  "NGCP::Schema::Result::subscribers",
   { id => "subscriber_id" },
   {
     is_deferrable => 1,
@@ -55,7 +55,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::numbers
+NGCP::Schema::Result::numbers
 
 =head1 COMPONENTS LOADED
 
@@ -67,7 +67,7 @@ NGCP::Schema::carrier::Result::numbers
 
 =back
 
-=head1 TABLE: C<numbers>
+=head1 TABLE: C<carrier.numbers>
 
 =head1 ACCESSORS
 
@@ -98,7 +98,7 @@ NGCP::Schema::carrier::Result::numbers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::subscribers>
+Related object: L<NGCP::Schema::Result::subscribers>
 
 =cut
 

lib/NGCP/Schema/Result/order_payments.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::order_payments;
+package NGCP::Schema::Result::order_payments;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("order_payments");
+__PACKAGE__->table("billing.order_payments");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "order",
-  "NGCP::Schema::billing::Result::orders",
+  "NGCP::Schema::Result::orders",
   { id => "order_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -56,7 +56,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "payment",
-  "NGCP::Schema::billing::Result::payments",
+  "NGCP::Schema::Result::payments",
   { id => "payment_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -70,7 +70,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::order_payments
+NGCP::Schema::Result::order_payments
 
 =head1 COMPONENTS LOADED
 
@@ -82,7 +82,7 @@ NGCP::Schema::billing::Result::order_payments
 
 =back
 
-=head1 TABLE: C<order_payments>
+=head1 TABLE: C<billing.order_payments>
 
 =head1 ACCESSORS
 
@@ -121,13 +121,13 @@ NGCP::Schema::billing::Result::order_payments
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::orders>
+Related object: L<NGCP::Schema::Result::orders>
 
 =head2 payment
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::payments>
+Related object: L<NGCP::Schema::Result::payments>
 
 =cut
 

lib/NGCP/Schema/Result/orders.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::orders;
+package NGCP::Schema::Result::orders;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("orders");
+__PACKAGE__->table("billing.orders");
 
 
 __PACKAGE__->add_columns(
@@ -96,7 +96,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->has_many(
   "contracts",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { "foreign.order_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -104,7 +104,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "customer",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { id => "customer_id" },
   {
     is_deferrable => 1,
@@ -117,7 +117,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "delivery_contact",
-  "NGCP::Schema::billing::Result::contacts",
+  "NGCP::Schema::Result::contacts",
   { id => "delivery_contact_id" },
   {
     is_deferrable => 1,
@@ -130,7 +130,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "invoice",
-  "NGCP::Schema::billing::Result::invoices",
+  "NGCP::Schema::Result::invoices",
   { id => "invoice_id" },
   {
     is_deferrable => 1,
@@ -143,7 +143,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "order_payments",
-  "NGCP::Schema::billing::Result::order_payments",
+  "NGCP::Schema::Result::order_payments",
   { "foreign.order_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -151,7 +151,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -170,7 +170,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::orders
+NGCP::Schema::Result::orders
 
 =head1 COMPONENTS LOADED
 
@@ -182,7 +182,7 @@ NGCP::Schema::billing::Result::orders
 
 =back
 
-=head1 TABLE: C<orders>
+=head1 TABLE: C<billing.orders>
 
 =head1 ACCESSORS
 
@@ -279,37 +279,37 @@ NGCP::Schema::billing::Result::orders
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 customer
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =head2 delivery_contact
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contacts>
+Related object: L<NGCP::Schema::Result::contacts>
 
 =head2 invoice
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::invoices>
+Related object: L<NGCP::Schema::Result::invoices>
 
 =head2 order_payments
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::order_payments>
+Related object: L<NGCP::Schema::Result::order_payments>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =cut
 

lib/NGCP/Schema/Result/packets.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::sipstats::Result::packets;
+package NGCP::Schema::Result::packets;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("packets");
+__PACKAGE__->table("sipstats.packets");
 
 
 __PACKAGE__->add_columns(
@@ -52,7 +52,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::sipstats::Result::packets
+NGCP::Schema::Result::packets
 
 =head1 COMPONENTS LOADED
 
@@ -64,7 +64,7 @@ NGCP::Schema::sipstats::Result::packets
 
 =back
 
-=head1 TABLE: C<packets>
+=head1 TABLE: C<sipstats.packets>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/payments.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::payments;
+package NGCP::Schema::Result::payments;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("payments");
+__PACKAGE__->table("billing.payments");
 
 
 __PACKAGE__->add_columns(
@@ -68,7 +68,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->has_many(
   "credit_payments",
-  "NGCP::Schema::billing::Result::credit_payments",
+  "NGCP::Schema::Result::credit_payments",
   { "foreign.payment_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -76,7 +76,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "order_payments",
-  "NGCP::Schema::billing::Result::order_payments",
+  "NGCP::Schema::Result::order_payments",
   { "foreign.payment_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -90,7 +90,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::payments
+NGCP::Schema::Result::payments
 
 =head1 COMPONENTS LOADED
 
@@ -102,7 +102,7 @@ NGCP::Schema::billing::Result::payments
 
 =back
 
-=head1 TABLE: C<payments>
+=head1 TABLE: C<billing.payments>
 
 =head1 ACCESSORS
 
@@ -186,13 +186,13 @@ NGCP::Schema::billing::Result::payments
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::credit_payments>
+Related object: L<NGCP::Schema::Result::credit_payments>
 
 =head2 order_payments
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::order_payments>
+Related object: L<NGCP::Schema::Result::order_payments>
 
 =cut
 

lib/NGCP/Schema/Result/peer_preferences.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::peer_preferences;
+package NGCP::Schema::Result::peer_preferences;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("peer_preferences");
+__PACKAGE__->table("kamailio.peer_preferences");
 
 
 __PACKAGE__->add_columns(
@@ -59,7 +59,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::peer_preferences
+NGCP::Schema::Result::peer_preferences
 
 =head1 COMPONENTS LOADED
 
@@ -71,7 +71,7 @@ NGCP::Schema::kamailio::Result::peer_preferences
 
 =back
 
-=head1 TABLE: C<peer_preferences>
+=head1 TABLE: C<kamailio.peer_preferences>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/prepaid_costs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::accounting::Result::prepaid_costs;
+package NGCP::Schema::Result::prepaid_costs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("prepaid_costs");
+__PACKAGE__->table("accounting.prepaid_costs");
 
 
 __PACKAGE__->add_columns(
@@ -53,7 +53,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::accounting::Result::prepaid_costs
+NGCP::Schema::Result::prepaid_costs
 
 =head1 COMPONENTS LOADED
 
@@ -65,7 +65,7 @@ NGCP::Schema::accounting::Result::prepaid_costs
 
 =back
 
-=head1 TABLE: C<prepaid_costs>
+=head1 TABLE: C<accounting.prepaid_costs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/presentity.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::presentity;
+package NGCP::Schema::Result::presentity;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("presentity");
+__PACKAGE__->table("kamailio.presentity");
 
 
 __PACKAGE__->add_columns(
@@ -59,7 +59,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::presentity
+NGCP::Schema::Result::presentity
 
 =head1 COMPONENTS LOADED
 
@@ -71,7 +71,7 @@ NGCP::Schema::kamailio::Result::presentity
 
 =back
 
-=head1 TABLE: C<presentity>
+=head1 TABLE: C<kamailio.presentity>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/products.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::products;
+package NGCP::Schema::Result::products;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("products");
+__PACKAGE__->table("billing.products");
 
 
 __PACKAGE__->add_columns(
@@ -79,7 +79,7 @@ __PACKAGE__->add_unique_constraint("resnam_idx", ["reseller_id", "name"]);
 
 __PACKAGE__->has_many(
   "billing_mappings",
-  "NGCP::Schema::billing::Result::billing_mappings",
+  "NGCP::Schema::Result::billing_mappings",
   { "foreign.product_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -87,7 +87,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "billing_profile",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { id => "billing_profile_id" },
   {
     is_deferrable => 1,
@@ -100,7 +100,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->belongs_to(
   "reseller",
-  "NGCP::Schema::billing::Result::resellers",
+  "NGCP::Schema::Result::resellers",
   { id => "reseller_id" },
   {
     is_deferrable => 1,
@@ -119,7 +119,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::products
+NGCP::Schema::Result::products
 
 =head1 COMPONENTS LOADED
 
@@ -131,7 +131,7 @@ NGCP::Schema::billing::Result::products
 
 =back
 
-=head1 TABLE: C<products>
+=head1 TABLE: C<billing.products>
 
 =head1 ACCESSORS
 
@@ -227,19 +227,19 @@ NGCP::Schema::billing::Result::products
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_mappings>
+Related object: L<NGCP::Schema::Result::billing_mappings>
 
 =head2 billing_profile
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =head2 reseller
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::resellers>
+Related object: L<NGCP::Schema::Result::resellers>
 
 =cut
 

lib/NGCP/Schema/Result/provisioning_voip_subscribers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::provisioning::Result::voip_subscribers;
+package NGCP::Schema::Result::provisioning_voip_subscribers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("voip_subscribers");
+__PACKAGE__->table("provisioning.voip_subscribers");
 
 
 __PACKAGE__->add_columns(
@@ -82,7 +82,7 @@ __PACKAGE__->add_unique_constraint("webuser_dom_idx", ["webusername", "domain_id
 
 __PACKAGE__->belongs_to(
   "domain",
-  "NGCP::Schema::provisioning::Result::voip_domains",
+  "NGCP::Schema::Result::voip_domains",
   { id => "domain_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -90,7 +90,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "voip_cc_mappings",
-  "NGCP::Schema::provisioning::Result::voip_cc_mappings",
+  "NGCP::Schema::Result::voip_cc_mappings",
   { "foreign.uuid" => "self.uuid" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -98,7 +98,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_cf_destination_sets",
-  "NGCP::Schema::provisioning::Result::voip_cf_destination_sets",
+  "NGCP::Schema::Result::voip_cf_destination_sets",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -106,7 +106,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_cf_mappings",
-  "NGCP::Schema::provisioning::Result::voip_cf_mappings",
+  "NGCP::Schema::Result::voip_cf_mappings",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -114,7 +114,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_cf_time_sets",
-  "NGCP::Schema::provisioning::Result::voip_cf_time_sets",
+  "NGCP::Schema::Result::voip_cf_time_sets",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -122,7 +122,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_contacts",
-  "NGCP::Schema::provisioning::Result::voip_contacts",
+  "NGCP::Schema::Result::voip_contacts",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -130,7 +130,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_dbaliases",
-  "NGCP::Schema::provisioning::Result::voip_dbaliases",
+  "NGCP::Schema::Result::voip_dbaliases",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -138,7 +138,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_fax_destinations",
-  "NGCP::Schema::provisioning::Result::voip_fax_destinations",
+  "NGCP::Schema::Result::voip_fax_destinations",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -146,7 +146,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->might_have(
   "voip_fax_preference",
-  "NGCP::Schema::provisioning::Result::voip_fax_preferences",
+  "NGCP::Schema::Result::voip_fax_preferences",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -154,7 +154,7 @@ __PACKAGE__->might_have(
 
 __PACKAGE__->might_have(
   "voip_reminder",
-  "NGCP::Schema::provisioning::Result::voip_reminder",
+  "NGCP::Schema::Result::voip_reminder",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -162,7 +162,7 @@ __PACKAGE__->might_have(
 
 __PACKAGE__->has_many(
   "voip_speed_dials",
-  "NGCP::Schema::provisioning::Result::voip_speed_dial",
+  "NGCP::Schema::Result::voip_speed_dial",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -170,7 +170,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_trusted_sources",
-  "NGCP::Schema::provisioning::Result::voip_trusted_sources",
+  "NGCP::Schema::Result::voip_trusted_sources",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -178,7 +178,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_usr_preferences",
-  "NGCP::Schema::provisioning::Result::voip_usr_preferences",
+  "NGCP::Schema::Result::voip_usr_preferences",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -192,7 +192,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::provisioning::Result::voip_subscribers
+NGCP::Schema::Result::provisioning_voip_subscribers
 
 =head1 COMPONENTS LOADED
 
@@ -204,7 +204,7 @@ NGCP::Schema::provisioning::Result::voip_subscribers
 
 =back
 
-=head1 TABLE: C<voip_subscribers>
+=head1 TABLE: C<provisioning.voip_subscribers>
 
 =head1 ACCESSORS
 
@@ -334,79 +334,79 @@ NGCP::Schema::provisioning::Result::voip_subscribers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_domains>
+Related object: L<NGCP::Schema::Result::voip_domains>
 
 =head2 voip_cc_mappings
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_cc_mappings>
+Related object: L<NGCP::Schema::Result::voip_cc_mappings>
 
 =head2 voip_cf_destination_sets
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_cf_destination_sets>
+Related object: L<NGCP::Schema::Result::voip_cf_destination_sets>
 
 =head2 voip_cf_mappings
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_cf_mappings>
+Related object: L<NGCP::Schema::Result::voip_cf_mappings>
 
 =head2 voip_cf_time_sets
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_cf_time_sets>
+Related object: L<NGCP::Schema::Result::voip_cf_time_sets>
 
 =head2 voip_contacts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_contacts>
+Related object: L<NGCP::Schema::Result::voip_contacts>
 
 =head2 voip_dbaliases
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_dbaliases>
+Related object: L<NGCP::Schema::Result::voip_dbaliases>
 
 =head2 voip_fax_destinations
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_fax_destinations>
+Related object: L<NGCP::Schema::Result::voip_fax_destinations>
 
 =head2 voip_fax_preference
 
 Type: might_have
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_fax_preferences>
+Related object: L<NGCP::Schema::Result::voip_fax_preferences>
 
 =head2 voip_reminder
 
 Type: might_have
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_reminder>
+Related object: L<NGCP::Schema::Result::voip_reminder>
 
 =head2 voip_speed_dials
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_speed_dial>
+Related object: L<NGCP::Schema::Result::voip_speed_dial>
 
 =head2 voip_trusted_sources
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_trusted_sources>
+Related object: L<NGCP::Schema::Result::voip_trusted_sources>
 
 =head2 voip_usr_preferences
 
 Type: has_many
 
-Related object: L<NGCP::Schema::provisioning::Result::voip_usr_preferences>
+Related object: L<NGCP::Schema::Result::voip_usr_preferences>
 
 =cut
 

lib/NGCP/Schema/Result/pua.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::pua;
+package NGCP::Schema::Result::pua;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("pua");
+__PACKAGE__->table("kamailio.pua");
 
 
 __PACKAGE__->add_columns(
@@ -79,7 +79,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::pua
+NGCP::Schema::Result::pua
 
 =head1 COMPONENTS LOADED
 
@@ -91,7 +91,7 @@ NGCP::Schema::kamailio::Result::pua
 
 =back
 
-=head1 TABLE: C<pua>
+=head1 TABLE: C<kamailio.pua>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/resellers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::billing::Result::resellers;
+package NGCP::Schema::Result::resellers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("resellers");
+__PACKAGE__->table("billing.resellers");
 
 
 __PACKAGE__->add_columns(
@@ -56,7 +56,7 @@ __PACKAGE__->add_unique_constraint("name_idx", ["name"]);
 
 __PACKAGE__->has_many(
   "admins",
-  "NGCP::Schema::billing::Result::admins",
+  "NGCP::Schema::Result::admins",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -64,7 +64,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "billing_profiles",
-  "NGCP::Schema::billing::Result::billing_profiles",
+  "NGCP::Schema::Result::billing_profiles",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -72,7 +72,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -80,7 +80,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "contracts",
-  "NGCP::Schema::billing::Result::contracts",
+  "NGCP::Schema::Result::contracts",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -88,7 +88,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "customers",
-  "NGCP::Schema::billing::Result::customers",
+  "NGCP::Schema::Result::customers",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -96,7 +96,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "domain_resellers",
-  "NGCP::Schema::billing::Result::domain_resellers",
+  "NGCP::Schema::Result::domain_resellers",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -104,7 +104,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "ncos_levels",
-  "NGCP::Schema::billing::Result::ncos_levels",
+  "NGCP::Schema::Result::ncos_levels",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -112,7 +112,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "orders",
-  "NGCP::Schema::billing::Result::orders",
+  "NGCP::Schema::Result::orders",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -120,7 +120,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "products",
-  "NGCP::Schema::billing::Result::products",
+  "NGCP::Schema::Result::products",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -128,7 +128,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_intercepts",
-  "NGCP::Schema::billing::Result::voip_intercept",
+  "NGCP::Schema::Result::voip_intercept",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -136,7 +136,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_number_block_resellers",
-  "NGCP::Schema::billing::Result::voip_number_block_resellers",
+  "NGCP::Schema::Result::voip_number_block_resellers",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -144,7 +144,7 @@ __PACKAGE__->has_many(
 
 __PACKAGE__->has_many(
   "voip_numbers",
-  "NGCP::Schema::billing::Result::voip_numbers",
+  "NGCP::Schema::Result::voip_numbers",
   { "foreign.reseller_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -158,7 +158,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::billing::Result::resellers
+NGCP::Schema::Result::resellers
 
 =head1 COMPONENTS LOADED
 
@@ -170,7 +170,7 @@ NGCP::Schema::billing::Result::resellers
 
 =back
 
-=head1 TABLE: C<resellers>
+=head1 TABLE: C<billing.resellers>
 
 =head1 ACCESSORS
 
@@ -233,73 +233,73 @@ NGCP::Schema::billing::Result::resellers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::admins>
+Related object: L<NGCP::Schema::Result::admins>
 
 =head2 billing_profiles
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::billing_profiles>
+Related object: L<NGCP::Schema::Result::billing_profiles>
 
 =head2 contract
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 contracts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::contracts>
+Related object: L<NGCP::Schema::Result::contracts>
 
 =head2 customers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::customers>
+Related object: L<NGCP::Schema::Result::customers>
 
 =head2 domain_resellers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::domain_resellers>
+Related object: L<NGCP::Schema::Result::domain_resellers>
 
 =head2 ncos_levels
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::ncos_levels>
+Related object: L<NGCP::Schema::Result::ncos_levels>
 
 =head2 orders
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::orders>
+Related object: L<NGCP::Schema::Result::orders>
 
 =head2 products
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::products>
+Related object: L<NGCP::Schema::Result::products>
 
 =head2 voip_intercepts
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::voip_intercept>
+Related object: L<NGCP::Schema::Result::voip_intercept>
 
 =head2 voip_number_block_resellers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::voip_number_block_resellers>
+Related object: L<NGCP::Schema::Result::voip_number_block_resellers>
 
 =head2 voip_numbers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::billing::Result::voip_numbers>
+Related object: L<NGCP::Schema::Result::voip_numbers>
 
 =cut
 

lib/NGCP/Schema/Result/rls_presentity.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::rls_presentity;
+package NGCP::Schema::Result::rls_presentity;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("rls_presentity");
+__PACKAGE__->table("kamailio.rls_presentity");
 
 
 __PACKAGE__->add_columns(
@@ -59,7 +59,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::rls_presentity
+NGCP::Schema::Result::rls_presentity
 
 =head1 COMPONENTS LOADED
 
@@ -71,7 +71,7 @@ NGCP::Schema::kamailio::Result::rls_presentity
 
 =back
 
-=head1 TABLE: C<rls_presentity>
+=head1 TABLE: C<kamailio.rls_presentity>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/rls_watchers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::rls_watchers;
+package NGCP::Schema::Result::rls_watchers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("rls_watchers");
+__PACKAGE__->table("kamailio.rls_watchers");
 
 
 __PACKAGE__->add_columns(
@@ -94,7 +94,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::rls_watchers
+NGCP::Schema::Result::rls_watchers
 
 =head1 COMPONENTS LOADED
 
@@ -106,7 +106,7 @@ NGCP::Schema::kamailio::Result::rls_watchers
 
 =back
 
-=head1 TABLE: C<rls_watchers>
+=head1 TABLE: C<kamailio.rls_watchers>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/sca_subscriptions.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::sca_subscriptions;
+package NGCP::Schema::Result::sca_subscriptions;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("sca_subscriptions");
+__PACKAGE__->table("kamailio.sca_subscriptions");
 
 
 __PACKAGE__->add_columns(
@@ -70,7 +70,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::sca_subscriptions
+NGCP::Schema::Result::sca_subscriptions
 
 =head1 COMPONENTS LOADED
 
@@ -82,7 +82,7 @@ NGCP::Schema::kamailio::Result::sca_subscriptions
 
 =back
 
-=head1 TABLE: C<sca_subscriptions>
+=head1 TABLE: C<kamailio.sca_subscriptions>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/sems_registrations.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::sems_registrations;
+package NGCP::Schema::Result::sems_registrations;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("sems_registrations");
+__PACKAGE__->table("kamailio.sems_registrations");
 
 
 __PACKAGE__->add_columns(
@@ -55,7 +55,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::sems_registrations
+NGCP::Schema::Result::sems_registrations
 
 =head1 COMPONENTS LOADED
 
@@ -67,7 +67,7 @@ NGCP::Schema::kamailio::Result::sems_registrations
 
 =back
 
-=head1 TABLE: C<sems_registrations>
+=head1 TABLE: C<kamailio.sems_registrations>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/silo.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::silo;
+package NGCP::Schema::Result::silo;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("silo");
+__PACKAGE__->table("kamailio.silo");
 
 
 __PACKAGE__->add_columns(
@@ -69,7 +69,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::silo
+NGCP::Schema::Result::silo
 
 =head1 COMPONENTS LOADED
 
@@ -81,7 +81,7 @@ NGCP::Schema::kamailio::Result::silo
 
 =back
 
-=head1 TABLE: C<silo>
+=head1 TABLE: C<kamailio.silo>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/sipstats_mark.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::sipstats::Result::mark;
+package NGCP::Schema::Result::sipstats_mark;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("mark");
+__PACKAGE__->table("sipstats.mark");
 
 
 __PACKAGE__->add_columns(
@@ -37,7 +37,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::sipstats::Result::mark
+NGCP::Schema::Result::sipstats_mark
 
 =head1 COMPONENTS LOADED
 
@@ -49,7 +49,7 @@ NGCP::Schema::sipstats::Result::mark
 
 =back
 
-=head1 TABLE: C<mark>
+=head1 TABLE: C<sipstats.mark>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/speed_dial.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::speed_dial;
+package NGCP::Schema::Result::speed_dial;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("speed_dial");
+__PACKAGE__->table("kamailio.speed_dial");
 
 
 __PACKAGE__->add_columns(
@@ -62,7 +62,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::speed_dial
+NGCP::Schema::Result::speed_dial
 
 =head1 COMPONENTS LOADED
 
@@ -74,7 +74,7 @@ NGCP::Schema::kamailio::Result::speed_dial
 
 =back
 
-=head1 TABLE: C<speed_dial>
+=head1 TABLE: C<kamailio.speed_dial>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/statistics.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::sipstats::Result::statistics;
+package NGCP::Schema::Result::statistics;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("statistics");
+__PACKAGE__->table("sipstats.statistics");
 
 
 __PACKAGE__->add_columns(
@@ -245,7 +245,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::sipstats::Result::statistics
+NGCP::Schema::Result::statistics
 
 =head1 COMPONENTS LOADED
 
@@ -257,7 +257,7 @@ NGCP::Schema::sipstats::Result::statistics
 
 =back
 
-=head1 TABLE: C<statistics>
+=head1 TABLE: C<sipstats.statistics>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/subscriber.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::subscriber;
+package NGCP::Schema::Result::subscriber;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("subscriber");
+__PACKAGE__->table("kamailio.subscriber");
 
 
 __PACKAGE__->add_columns(
@@ -68,7 +68,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::subscriber
+NGCP::Schema::Result::subscriber
 
 =head1 COMPONENTS LOADED
 
@@ -80,7 +80,7 @@ NGCP::Schema::kamailio::Result::subscriber
 
 =back
 
-=head1 TABLE: C<subscriber>
+=head1 TABLE: C<kamailio.subscriber>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/subscribers.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::carrier::Result::subscribers;
+package NGCP::Schema::Result::subscribers;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("subscribers");
+__PACKAGE__->table("carrier.subscribers");
 
 
 __PACKAGE__->add_columns(
@@ -58,7 +58,7 @@ __PACKAGE__->add_unique_constraint("usrdom_idx", ["username", "domain"]);
 
 __PACKAGE__->belongs_to(
   "contract",
-  "NGCP::Schema::carrier::Result::contracts",
+  "NGCP::Schema::Result::carrier_contracts",
   { id => "contract_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
@@ -66,7 +66,7 @@ __PACKAGE__->belongs_to(
 
 __PACKAGE__->has_many(
   "numbers",
-  "NGCP::Schema::carrier::Result::numbers",
+  "NGCP::Schema::Result::numbers",
   { "foreign.subscriber_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
@@ -80,7 +80,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::carrier::Result::subscribers
+NGCP::Schema::Result::subscribers
 
 =head1 COMPONENTS LOADED
 
@@ -92,7 +92,7 @@ NGCP::Schema::carrier::Result::subscribers
 
 =back
 
-=head1 TABLE: C<subscribers>
+=head1 TABLE: C<carrier.subscribers>
 
 =head1 ACCESSORS
 
@@ -178,13 +178,13 @@ NGCP::Schema::carrier::Result::subscribers
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::carrier::Result::contracts>
+Related object: L<NGCP::Schema::Result::carrier_contracts>
 
 =head2 numbers
 
 Type: has_many
 
-Related object: L<NGCP::Schema::carrier::Result::numbers>
+Related object: L<NGCP::Schema::Result::numbers>
 
 =cut
 

lib/NGCP/Schema/Result/trusted.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::trusted;
+package NGCP::Schema::Result::trusted;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("trusted");
+__PACKAGE__->table("kamailio.trusted");
 
 
 __PACKAGE__->add_columns(
@@ -48,7 +48,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::trusted
+NGCP::Schema::Result::trusted
 
 =head1 COMPONENTS LOADED
 
@@ -60,7 +60,7 @@ NGCP::Schema::kamailio::Result::trusted
 
 =back
 
-=head1 TABLE: C<trusted>
+=head1 TABLE: C<kamailio.trusted>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_credentials.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_credentials;
+package NGCP::Schema::Result::uid_credentials;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_credentials");
+__PACKAGE__->table("kamailio.uid_credentials");
 
 
 __PACKAGE__->add_columns(
@@ -61,7 +61,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_credentials
+NGCP::Schema::Result::uid_credentials
 
 =head1 COMPONENTS LOADED
 
@@ -73,7 +73,7 @@ NGCP::Schema::kamailio::Result::uid_credentials
 
 =back
 
-=head1 TABLE: C<uid_credentials>
+=head1 TABLE: C<kamailio.uid_credentials>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_domain.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_domain;
+package NGCP::Schema::Result::uid_domain;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_domain");
+__PACKAGE__->table("kamailio.uid_domain");
 
 
 __PACKAGE__->add_columns(
@@ -54,7 +54,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_domain
+NGCP::Schema::Result::uid_domain
 
 =head1 COMPONENTS LOADED
 
@@ -66,7 +66,7 @@ NGCP::Schema::kamailio::Result::uid_domain
 
 =back
 
-=head1 TABLE: C<uid_domain>
+=head1 TABLE: C<kamailio.uid_domain>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_domain_attrs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_domain_attrs;
+package NGCP::Schema::Result::uid_domain_attrs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_domain_attrs");
+__PACKAGE__->table("kamailio.uid_domain_attrs");
 
 
 __PACKAGE__->add_columns(
@@ -58,7 +58,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_domain_attrs
+NGCP::Schema::Result::uid_domain_attrs
 
 =head1 COMPONENTS LOADED
 
@@ -70,7 +70,7 @@ NGCP::Schema::kamailio::Result::uid_domain_attrs
 
 =back
 
-=head1 TABLE: C<uid_domain_attrs>
+=head1 TABLE: C<kamailio.uid_domain_attrs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_global_attrs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_global_attrs;
+package NGCP::Schema::Result::uid_global_attrs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_global_attrs");
+__PACKAGE__->table("kamailio.uid_global_attrs");
 
 
 __PACKAGE__->add_columns(
@@ -56,7 +56,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_global_attrs
+NGCP::Schema::Result::uid_global_attrs
 
 =head1 COMPONENTS LOADED
 
@@ -68,7 +68,7 @@ NGCP::Schema::kamailio::Result::uid_global_attrs
 
 =back
 
-=head1 TABLE: C<uid_global_attrs>
+=head1 TABLE: C<kamailio.uid_global_attrs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_uri.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_uri;
+package NGCP::Schema::Result::uid_uri;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_uri");
+__PACKAGE__->table("kamailio.uid_uri");
 
 
 __PACKAGE__->add_columns(
@@ -55,7 +55,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_uri
+NGCP::Schema::Result::uid_uri
 
 =head1 COMPONENTS LOADED
 
@@ -67,7 +67,7 @@ NGCP::Schema::kamailio::Result::uid_uri
 
 =back
 
-=head1 TABLE: C<uid_uri>
+=head1 TABLE: C<kamailio.uid_uri>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_uri_attrs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_uri_attrs;
+package NGCP::Schema::Result::uid_uri_attrs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_uri_attrs");
+__PACKAGE__->table("kamailio.uid_uri_attrs");
 
 
 __PACKAGE__->add_columns(
@@ -65,7 +65,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_uri_attrs
+NGCP::Schema::Result::uid_uri_attrs
 
 =head1 COMPONENTS LOADED
 
@@ -77,7 +77,7 @@ NGCP::Schema::kamailio::Result::uid_uri_attrs
 
 =back
 
-=head1 TABLE: C<uid_uri_attrs>
+=head1 TABLE: C<kamailio.uid_uri_attrs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/uid_user_attrs.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::uid_user_attrs;
+package NGCP::Schema::Result::uid_user_attrs;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("uid_user_attrs");
+__PACKAGE__->table("kamailio.uid_user_attrs");
 
 
 __PACKAGE__->add_columns(
@@ -58,7 +58,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::uid_user_attrs
+NGCP::Schema::Result::uid_user_attrs
 
 =head1 COMPONENTS LOADED
 
@@ -70,7 +70,7 @@ NGCP::Schema::kamailio::Result::uid_user_attrs
 
 =back
 
-=head1 TABLE: C<uid_user_attrs>
+=head1 TABLE: C<kamailio.uid_user_attrs>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/usr_preferences.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::usr_preferences;
+package NGCP::Schema::Result::usr_preferences;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("usr_preferences");
+__PACKAGE__->table("kamailio.usr_preferences");
 
 
 __PACKAGE__->add_columns(
@@ -59,7 +59,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::usr_preferences
+NGCP::Schema::Result::usr_preferences
 
 =head1 COMPONENTS LOADED
 
@@ -71,7 +71,7 @@ NGCP::Schema::kamailio::Result::usr_preferences
 
 =back
 
-=head1 TABLE: C<usr_preferences>
+=head1 TABLE: C<kamailio.usr_preferences>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/version.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::version;
+package NGCP::Schema::Result::version;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("version");
+__PACKAGE__->table("kamailio.version");
 
 
 __PACKAGE__->add_columns(
@@ -42,7 +42,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::version
+NGCP::Schema::Result::version
 
 =head1 COMPONENTS LOADED
 
@@ -54,7 +54,7 @@ NGCP::Schema::kamailio::Result::version
 
 =back
 
-=head1 TABLE: C<version>
+=head1 TABLE: C<kamailio.version>
 
 =head1 ACCESSORS
 

lib/NGCP/Schema/Result/voicemail_spool.pm

@@ -1,4 +1,4 @@
-package NGCP::Schema::kamailio::Result::voicemail_spool;
+package NGCP::Schema::Result::voicemail_spool;
 use Sipwise::Base;
 use MooseX::NonMoose;
 use Scalar::Util qw(blessed);
@@ -15,7 +15,7 @@ extends 'DBIx::Class::Core';
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
 
-__PACKAGE__->table("voicemail_spool");
+__PACKAGE__->table("kamailio.voicemail_spool");
 
 
 __PACKAGE__->add_columns(
@@ -60,7 +60,7 @@ __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
   "mailboxuser",
-  "NGCP::Schema::kamailio::Result::voicemail_users",
+  "NGCP::Schema::Result::voicemail_users",
   { customer_id => "mailboxuser" },
   {
     is_deferrable => 1,
@@ -79,7 +79,7 @@ sub TO_JSON {
 
 =head1 NAME
 
-NGCP::Schema::kamailio::Result::voicemail_spool
+NGCP::Schema::Result::voicemail_spool
 
 =head1 COMPONENTS LOADED
 
@@ -91,7 +91,7 @@ NGCP::Schema::kamailio::Result::voicemail_spool
 
 =back
 
-=head1 TABLE: C<voicemail_spool>
+=head1 TABLE: C<kamailio.voicemail_spool>
 
 =head1 ACCESSORS
 
@@ -184,7 +184,7 @@ NGCP::Schema::kamailio::Result::voicemail_spool
 
 Type: belongs_to
 
-Related object: L<NGCP::Schema::kamailio::Result::voicemail_users>
+Related object: L<NGCP::Schema::Result::voicemail_users>
 
 =cut