diff --git a/lib/NGCP/Schema/Result/autoprov_devices.pm b/lib/NGCP/Schema/Result/autoprov_devices.pm
index 7cc6ab64..ce807a44 100644
--- a/lib/NGCP/Schema/Result/autoprov_devices.pm
+++ b/lib/NGCP/Schema/Result/autoprov_devices.pm
@@ -79,6 +79,14 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
+__PACKAGE__->might_have(
+  "autoprov_redirect_credentials",
+  "NGCP::Schema::Result::autoprov_redirect_credentials",
+  { "foreign.device_id" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+
+
 __PACKAGE__->set_primary_key("id");
 
 sub TO_JSON {
diff --git a/lib/NGCP/Schema/Result/contract_vendor_credentials.pm b/lib/NGCP/Schema/Result/autoprov_redirect_credentials.pm
similarity index 80%
rename from lib/NGCP/Schema/Result/contract_vendor_credentials.pm
rename to lib/NGCP/Schema/Result/autoprov_redirect_credentials.pm
index fe563064..c65396fb 100644
--- a/lib/NGCP/Schema/Result/contract_vendor_credentials.pm
+++ b/lib/NGCP/Schema/Result/autoprov_redirect_credentials.pm
@@ -1,4 +1,4 @@
-package NGCP::Schema::Result::contract_vendor_credentials;
+package NGCP::Schema::Result::autoprov_redirect_credentials;
 use Scalar::Util qw(blessed);
 use parent 'DBIx::Class::Core';
 
@@ -6,7 +6,7 @@ our $VERSION = '2.007';
 
 __PACKAGE__->load_components("InflateColumn::DateTime", "Helper::Row::ToJSON");
 
-__PACKAGE__->table("billing.contract_vendor_credentials");
+__PACKAGE__->table("provisioning.autoprov_redirect_credentials");
 
 __PACKAGE__->add_columns(
   "id",
@@ -16,19 +16,12 @@ __PACKAGE__->add_columns(
     is_auto_increment => 1,
     is_nullable => 0,
   },
-  "contract_id",
+  "device_id",
   {
     data_type => "integer",
     extra => { unsigned => 1 },
     is_nullable => 0,
   },
-  "vendor",
-  {
-    data_type => "enum",
-    default_value => "panasonic",
-    extra => { list => ["panasonic","linksys","yealink"] },
-    is_nullable => 0,
-  },
   "user",
   { data_type => "varchar", is_nullable => 0, size => 255 },
   "password",
@@ -38,9 +31,9 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("id");
 
 __PACKAGE__->belongs_to(
-  "contract",
-  "NGCP::Schema::Result::contracts",
-  { id => "contract_id" },
+  "device",
+  "NGCP::Schema::Result::autoprov_devices",
+  { id => "device_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
diff --git a/lib/NGCP/Schema/Result/contracts.pm b/lib/NGCP/Schema/Result/contracts.pm
index e9b2b870..b9eb61c0 100644
--- a/lib/NGCP/Schema/Result/contracts.pm
+++ b/lib/NGCP/Schema/Result/contracts.pm
@@ -197,13 +197,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-__PACKAGE__->has_many(
-  "vendor_credentials",
-  "NGCP::Schema::Result::contract_vendor_credentials",
-  { "foreign.contract_id" => "self.id" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
 __PACKAGE__->has_many(
   "voip_sound_sets",
   "NGCP::Schema::Result::voip_sound_sets",