diff --git a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm
index 6e41c83c61..aef3f4f19e 100644
--- a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm
+++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm
@@ -26,9 +26,9 @@ class_has 'api_description' => (
 with 'NGCP::Panel::Role::API';
 with 'NGCP::Panel::Role::API::RewriteRuleSets';
 
-class_has('resource_name', is => 'ro', default => 'rewrite');
-class_has('dispatch_path', is => 'ro', default => '/api/rewrite/');
-class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewrite');
+class_has('resource_name', is => 'ro', default => 'rewriterulesets');
+class_has('dispatch_path', is => 'ro', default => '/api/rewriterulesets/');
+class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewriterulesets');
 
 __PACKAGE__->config(
     action => {
@@ -65,7 +65,7 @@ sub GET :Allow {
         });
         my (@embedded, @links);
         for my $set ($rwr_set->search({}, {order_by => {-asc => 'me.id'}})->all) {
-            push @embedded, $self->hal_from_item($c, $set, "rewrite");
+            push @embedded, $self->hal_from_item($c, $set, "rewriterulesets");
             push @links, Data::HAL::Link->new(
                 relation => 'ngcp:'.$self->resource_name,
                 href     => sprintf('%s%d', $self->dispatch_path, $set->id),
diff --git a/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm
index 635ac53d9a..b875b95ce5 100644
--- a/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm
@@ -19,9 +19,9 @@ require Catalyst::ActionRole::RequireSSL;
 with 'NGCP::Panel::Role::API';
 with 'NGCP::Panel::Role::API::RewriteRuleSets';
 
-class_has('resource_name', is => 'ro', default => 'rewrite');
-class_has('dispatch_path', is => 'ro', default => '/api/rewrite/');
-class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewrite');
+class_has('resource_name', is => 'ro', default => 'rewriterulesets');
+class_has('dispatch_path', is => 'ro', default => '/api/rewriterulesets/');
+class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-rewriterulesets');
 
 __PACKAGE__->config(
     action => {
@@ -52,7 +52,7 @@ sub GET :Allow {
         my $ruleset = $self->item_by_id($c, $id, "rulesets");
         last unless $self->resource_exists($c, ruleset => $ruleset);
 
-        my $hal = $self->hal_from_item($c, $ruleset, "rewrite");
+        my $hal = $self->hal_from_item($c, $ruleset, "rewriterulesets");
 
         my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
             (map { # XXX Data::HAL must be able to generate links with multiple relations
@@ -118,7 +118,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $ruleset, "rulesets");
+            my $hal = $self->hal_from_item($c, $ruleset, "rewriterulesets");
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -158,7 +158,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $ruleset, "rulesets");
+            my $hal = $self->hal_from_item($c, $ruleset, "rewriterulesets");
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
diff --git a/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm b/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm
index a576cc570d..a61ea52413 100644
--- a/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm
+++ b/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm
@@ -69,12 +69,6 @@ sub item_rs {
         } else {
             return;
         }
-    } elsif($type eq "rules") {
-        if($c->user->roles eq "admin") {
-            $item_rs = $c->model('DB')->resultset('voip_rewrite_rules');
-        } else {
-            return;
-        }
     } else {
         die "You should not reach this";
     }
diff --git a/lib/NGCP/Panel/Role/API/RewriteRules.pm b/lib/NGCP/Panel/Role/API/RewriteRules.pm
index 2d0c1a6603..ccf99b9fb1 100644
--- a/lib/NGCP/Panel/Role/API/RewriteRules.pm
+++ b/lib/NGCP/Panel/Role/API/RewriteRules.pm
@@ -39,7 +39,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => "ngcp:$type", href => sprintf("/api/%s/%d", $type, $item->id)),
-            Data::HAL::Link->new(relation => "ngcp:rewrite", href => sprintf("/api/rewrite/%d", $item->set_id)), #TODO: naming?
+            Data::HAL::Link->new(relation => "ngcp:rewriterulesets", href => sprintf("/api/rewriterulesets/%d", $item->set_id)),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
@@ -59,13 +59,7 @@ sub item_rs {
     my ($self, $c, $type) = @_;
     my $item_rs;
 
-    if($type eq "rulesets") {
-        if($c->user->roles eq "admin") {
-            $item_rs = $c->model('DB')->resultset('voip_rewrite_rule_sets');
-        } else {
-            return;
-        }
-    } elsif($type eq "rules") {
+    if($type eq "rules") {
         if($c->user->roles eq "admin") {
             $item_rs = $c->model('DB')->resultset('voip_rewrite_rules');
         } else {