diff --git a/internal/features/cli/roles.feature b/internal/features/cli/roles.feature
index 7898668..be7d51e 100644
--- a/internal/features/cli/roles.feature
+++ b/internal/features/cli/roles.feature
@@ -36,14 +36,14 @@ Feature: Ernest role management
     When I run ernest with "role set --role reader --user ci_admin --project fakeaws --environment destroyable"
     Then The output should contain "User 'ci_admin' has been authorized to read resource fakeaws/destroyable"
     And I run ernest with "env info fakeaws destroyable"
-    Then The output should contain "usr (env owner)"
-    And The output should contain "ci_admin (env reader)"
+    Then The output should contain "usr (owner)"
+    And The output should contain "ci_admin (reader)"
     And I run ernest with "role unset --role reader --user ci_admin --project fakeaws"
     When I run ernest with "role unset --role reader --user ci_admin --project fakeaws --environment destroyable"
     Then The output should contain "User 'ci_admin' has been unauthorized as fakeaws/destroyable reader"
     And I run ernest with "env info fakeaws destroyable"
-    Then The output should contain "usr (env owner)"
-    And The output should not contain "ci_admin (env reader)"
+    Then The output should contain "usr (owner)"
+    And The output should not contain "ci_admin (reader)"
 
   Scenario: Plain user role inheritance
     Given I setup ernest with target "https://ernest.local"
@@ -55,7 +55,7 @@ Feature: Ernest role management
     And I run ernest with "role unset --role reader --user role_user --project fakeaws --environment destroyable"
     And I apply the definition "destroyable.yml"
     When I run ernest with "env info fakeaws destroyable"
-    Then The output should contain "usr (env owner)"
+    Then The output should contain "usr (owner)"
     And The output should not contain "role_user (reader)"
     When I'm logged in as "role_user" / "secret123"
     And I run ernest with "env list"
@@ -63,19 +63,19 @@ Feature: Ernest role management
     And I'm logged in as "usr" / "secret123"
     When I run ernest with "role set --role owner --user role_user --project fakeaws"
     And I run ernest with "env info fakeaws destroyable"
-    Then The output should contain "usr (env owner)"
-    And The output should contain "role_user (project owner)"
+    Then The output should contain "usr (owner)"
+    And The output should contain "role_user (owner)"
     When I'm logged in as "role_user" / "secret123"
     And I run ernest with "env list"
     And The output should contain "destroyable"
     And I'm logged in as "usr" / "secret123"
     When I run ernest with "role set --role reader --user role_user --project fakeaws --environment destroyable"
     And I run ernest with "env info fakeaws destroyable"
-    Then The output should contain "usr (env owner)"
-    And The output should contain "role_user (env reader)"
+    Then The output should contain "usr (owner)"
+    And The output should contain "role_user (reader)"
     When I'm logged in as "role_user" / "secret123"
     And I run ernest with "env info fakeaws destroyable"
-    Then The output should contain "role_user (env reader)"
+    Then The output should contain "role_user (reader)"
     When I run ernest with "env destroy --yes fakeaws destroyable"
     Then The output should contain "You don't have permissions to perform this action, please login as a resource owner"
     When I'm logged in as "role_user" / "secret123"