diff --git a/features/setup/setup.feature b/features/setup/setup.feature
index b2daec8..ae1685c 100644
--- a/features/setup/setup.feature
+++ b/features/setup/setup.feature
@@ -14,21 +14,21 @@ Feature: Set system to desired state before tests
 
   @APIUser:admin
   Scenario: Set up the system to test caching of subrequests
-    Given I create a "embeddedContentType" Content Type in "Content" with "embeddedContentType" identifier
+    Given I create a "embeddedContentType" content type in "Content" with "embeddedContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
     And I create "embeddedContentType" Content items in root in "eng-GB"
       | name              |
       | EmbeddedItemNoEsi |
       | EmbeddedItemEsi   |
-    And I create a "embeddingContentType_no_esi" Content Type in "Content" with "embeddingContentType_no_esi" identifier
+    And I create a "embeddingContentType_no_esi" content type in "Content" with "embeddingContentType_no_esi" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
       | Content relation (single) | Relation  | relation   | yes      | no	       | yes          |
     And I create "embeddingContentType_no_esi" Content items in root in "eng-GB"
       | name               | relation           |
       | EmbeddingItemNoEsi | /EmbeddedItemNoEsi |
-    And I create a "embeddingContentType_esi" Content Type in "Content" with "embeddingContentType_esi" identifier
+    And I create a "embeddingContentType_esi" content type in "Content" with "embeddingContentType_esi" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
       | Content relation (single) | Relation  | relation   | yes      | no	       | yes          |
diff --git a/features/symfony/cache.feature b/features/symfony/cache.feature
index cf61b96..6a9c732 100644
--- a/features/symfony/cache.feature
+++ b/features/symfony/cache.feature
@@ -9,7 +9,7 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt
     And I am viewing the pages on siteaccess "site" as <user> "<password>"
     When I visit <itemName> on siteaccess "site"
     And I reload the page
-    Then I see correct preview data for "Folder" Content Type
+    Then I see correct preview data for "Folder" content type
       | field | value      |
       | title | <itemName> |
     And response headers contain
@@ -30,7 +30,7 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt
       | TestFolder | <itemName> |
     And I am viewing the pages on siteaccess "site" as "<user>" with password "<password>"
     And I visit "<itemName>" on siteaccess "site"
-    And I see correct preview data for "Folder" Content Type
+    And I see correct preview data for "Folder" content type
       | field | value      |
       | title | <itemName> |
     When I edit "<itemName>" Content item in "eng-GB"
@@ -38,7 +38,7 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt
       | <itemNameAfterEdit> |
     And I reload the page
     And I reload the page
-    Then I see correct preview data for "Folder" Content Type
+    Then I see correct preview data for "Folder" content type
       | field | value               |
       | title | <itemNameAfterEdit> |
     And response headers contain
diff --git a/features/symfony/embed.feature b/features/symfony/embed.feature
index aea936b..96cc9f2 100644
--- a/features/symfony/embed.feature
+++ b/features/symfony/embed.feature
@@ -3,13 +3,13 @@ Feature: Caching of embedded items
 
   @admin
   Scenario Outline: Editing an embedded item refreshes the embedding item as well
-    Given I create a "embeddedContentType" Content Type in "Content" with "embeddedContentType" identifier
+    Given I create a "embeddedContentType" content type in "Content" with "embeddedContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
     And I create "embeddedContentType" Content items in root in "eng-GB"
       | name               |
       | <embeddedItemName> |
-    And I create a "embeddingContentType" Content Type in "Content" with "embeddingContentType" identifier
+    And I create a "embeddingContentType" content type in "Content" with "embeddingContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
       | Content relation (single) | Relation  | relation   | yes      | no	       | yes          |
diff --git a/features/symfony/permissions.feature b/features/symfony/permissions.feature
index ab52051..0379522 100644
--- a/features/symfony/permissions.feature
+++ b/features/symfony/permissions.feature
@@ -18,7 +18,7 @@ Feature: Cached response is different for users with different permissions
 
   @admin
   Scenario: Embedded Content Items are cached based on users permissions
-    Given I create a "testContentType" Content Type in "Content" with "testContentType" identifier
+    Given I create a "testContentType" content type in "Content" with "testContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	     | yes      | yes	       | yes          |
       | Content relation (single) | Relation  | relation   | yes      | no	       | yes          |
diff --git a/features/varnish/cache.feature b/features/varnish/cache.feature
index 104f1f8..956a519 100644
--- a/features/varnish/cache.feature
+++ b/features/varnish/cache.feature
@@ -12,7 +12,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
             | Header  | Value |
             | X-Cache | MISS  |
         And I reload the page
-        Then I see correct preview data for "Folder" Content Type
+        Then I see correct preview data for "Folder" content type
             | field | value      |
             | title | <itemName> |
         And response headers contain
@@ -32,7 +32,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
         And I am viewing the pages on siteaccess "site" as "<user>" "<password>"
         And I visit "<itemName>" on siteaccess "site"
         And I reload the page
-        And I see correct preview data for "Folder" Content Type
+        And I see correct preview data for "Folder" content type
             | field | value      |
             | title | <itemName> |
         And response headers contain
@@ -47,7 +47,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
         # Second reload is needed because of soft purging
         And I reload the page
         And I reload the page
-        Then I see correct preview data for "Folder" Content Type
+        Then I see correct preview data for "Folder" content type
             | field | value               |
             | title | <itemNameAfterEdit> |
         And response headers contain
diff --git a/features/varnish/embed.feature b/features/varnish/embed.feature
index baebe86..0c67d2c 100644
--- a/features/varnish/embed.feature
+++ b/features/varnish/embed.feature
@@ -3,13 +3,13 @@ Feature: Caching of embedded items
 
   @admin
   Scenario Outline: Editing an embedded item refreshes the embedding item as well
-    Given I create a "embeddedContentType" Content Type in "Content" with "embeddedContentType" identifier
+    Given I create a "embeddedContentType" content type in "Content" with "embeddedContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
     And I create "embeddedContentType" Content items in root in "eng-GB"
       | name               |
       | <embeddedItemName> |
-    And I create a "embeddingContentType" Content Type in "Content" with "embeddingContentType" identifier
+    And I create a "embeddingContentType" content type in "Content" with "embeddingContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	   | yes      | yes	       | yes          |
       | Content relation (single) | Relation  | relation   | yes      | no	       | yes          |
diff --git a/features/varnish/permissions.feature b/features/varnish/permissions.feature
index 4de14df..8e8072b 100644
--- a/features/varnish/permissions.feature
+++ b/features/varnish/permissions.feature
@@ -16,7 +16,7 @@ Feature: Cached response is different for users with different permissions
 
   @admin
   Scenario: Embedded Content Items are cached based on users permissions
-    Given I create a "testContentType" Content Type in "Content" with "testContentType" identifier
+    Given I create a "testContentType" content type in "Content" with "testContentType" identifier
       | Field Type                | Name      | Identifier | Required | Searchable | Translatable |
       | Text line                 | Name      | name	     | yes      | yes	       | yes          |
       | Content relation (single) | Relation  | relation   | yes      | no	       | yes          |
diff --git a/features/varnish/translations.feature b/features/varnish/translations.feature
index fba17cd..984ae48 100644
--- a/features/varnish/translations.feature
+++ b/features/varnish/translations.feature
@@ -8,7 +8,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
         And I am viewing the pages on siteaccess "site" as "<user>" "<password>"
         And I visit "<itemName>" on siteaccess "site"
         And I reload the page
-        And I see correct preview data for "Folder" Content Type
+        And I see correct preview data for "Folder" content type
             | field | value      |
             | title | <itemName> |
         And response headers contain
@@ -23,7 +23,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
         # Second reload is needed because of soft purging
         And I reload the page
         And I reload the page
-        Then I see correct preview data for "Folder" Content Type
+        Then I see correct preview data for "Folder" content type
             | field | value               |
             | title | <itemNameAfterEdit> |
         And response headers contain