diff --git a/features/ContentEdit/create_without_draft.feature b/features/ContentEdit/create_without_draft.feature
index 7751d490..5278c898 100644
--- a/features/ContentEdit/create_without_draft.feature
+++ b/features/ContentEdit/create_without_draft.feature
@@ -5,7 +5,7 @@ Feature: Edit content
 
 Scenario: Create a folder without a draft
     Given that I have permission to create folders
-      And there is a Content Type "folder" with the id "1"
+      And there is a content type "folder" with the id "1"
       #And there is a Location with the id "2"
      When I go to "content/create/nodraft/folder/eng-GB/2"
      Then I should see a folder content edit form
@@ -15,7 +15,7 @@ Scenario: Create a folder without a draft
 
 @javascript
 Scenario: Content validation errors are reported back
-    Given that there is a Content Type with any kind of constraints on a Field Definition
+    Given that there is a content type with any kind of constraints on a Field Definition
       And that I have permission to create content of this type
      When I go to the content creation page for this type
       And I fill in the constrained field with an invalid value
diff --git a/features/FieldTypeForm/checkbox_fieldtype_edit_form.feature b/features/FieldTypeForm/checkbox_fieldtype_edit_form.feature
index 53d3fde3..57a8ab51 100644
--- a/features/FieldTypeForm/checkbox_fieldtype_edit_form.feature
+++ b/features/FieldTypeForm/checkbox_fieldtype_edit_form.feature
@@ -4,7 +4,7 @@ Feature: Checkbox field value edit form
     I want the Checkbox field form to implement the FieldType's behaviour
 
 Background:
-    Given a Content Type with an ezboolean field definition
+    Given a content type with an ezboolean field definition
 
 Scenario: The attributes of the field have a form representation
     When I view the edit form for this field
diff --git a/features/FieldTypeForm/selection_fieldtype_edit_form.feature b/features/FieldTypeForm/selection_fieldtype_edit_form.feature
index 1058f3ef..8da83b8e 100644
--- a/features/FieldTypeForm/selection_fieldtype_edit_form.feature
+++ b/features/FieldTypeForm/selection_fieldtype_edit_form.feature
@@ -4,7 +4,7 @@ Feature: Selection field value edit form
     I want the Selection field form to implement the FieldType's behaviour
 
 Background:
-    Given a Content Type with an ezselection field definition
+    Given a content type with an ezselection field definition
 
 Scenario: The attributes of the field have a form representation
     Given I view the edit form for this field
diff --git a/features/FieldTypeForm/textline_fieldtype_edit_form.feature b/features/FieldTypeForm/textline_fieldtype_edit_form.feature
index 9a9b0224..f644e694 100644
--- a/features/FieldTypeForm/textline_fieldtype_edit_form.feature
+++ b/features/FieldTypeForm/textline_fieldtype_edit_form.feature
@@ -4,7 +4,7 @@ Feature: TextLine field value edit form
     I want the ezuser field form to implement the FieldType's behaviour
 
 Background:
-    Given a Content Type with a textline field definition
+    Given a content type with a textline field definition
 
 Scenario: The attributes of a textline field have a form representation
     When I view the edit form for this field
diff --git a/features/FieldTypeForm/user_fieldtype_edit_form.feature b/features/FieldTypeForm/user_fieldtype_edit_form.feature
index cdf9750b..9dc1c251 100644
--- a/features/FieldTypeForm/user_fieldtype_edit_form.feature
+++ b/features/FieldTypeForm/user_fieldtype_edit_form.feature
@@ -4,7 +4,7 @@ Feature: User field value edit form
     I want the ezuser field form to implement the FieldType's behaviour
 
 Background:
-    Given a Content Type with a user field definition
+    Given a content type with a user field definition
 
 Scenario: The attributes of a user field have a form representation
     When I view the edit user form for this field
diff --git a/src/lib/Behat/Context/ContentEditContext.php b/src/lib/Behat/Context/ContentEditContext.php
index bb5e6976..b3f430cb 100644
--- a/src/lib/Behat/Context/ContentEditContext.php
+++ b/src/lib/Behat/Context/ContentEditContext.php
@@ -163,7 +163,7 @@ public function thereIsARelevantErrorMessageLinkedToTheInvalidField()
     }
 
     /**
-     * @Given /^that there is a Content Type with any kind of constraints on a Field Definition$/
+     * @Given /^that there is a content type with any kind of constraints on a Field Definition$/
      */
     public function thereIsAContentTypeWithAnyKindOfConstraintsOnAFieldDefinition()
     {
diff --git a/src/lib/Behat/Context/ContentTypeContext.php b/src/lib/Behat/Context/ContentTypeContext.php
index 97e452fa..1e94510d 100644
--- a/src/lib/Behat/Context/ContentTypeContext.php
+++ b/src/lib/Behat/Context/ContentTypeContext.php
@@ -48,7 +48,7 @@ public function __construct(PermissionResolver $permissionResolver, ContentTypeS
     }
 
     /**
-     * @Given /^there is a Content Type "([^"]*)" with the id "([^"]*)"$/
+     * @Given /^there is a content type "([^"]*)" with the id "([^"]*)"$/
      */
     public function thereIsAContentTypeWithId($contentTypeIdentifier, $id)
     {
@@ -61,7 +61,7 @@ public function thereIsAContentTypeWithId($contentTypeIdentifier, $id)
     }
 
     /**
-     * @Given I remove :fieldIdentifier field from :contentTypeIdentifier Content Type
+     * @Given I remove :fieldIdentifier field from :contentTypeIdentifier content type
      */
     public function iRemoveFieldFromContentType($fieldIdentifier, $contentTypeIdentifier)
     {
@@ -94,7 +94,7 @@ public function addFieldsTo($contentTypeIdentifier, array $fieldDefinitions)
     public function getCurrentContentType()
     {
         if ($this->currentContentType === null) {
-            throw new Exception('No current Content Type has been defined in the context');
+            throw new Exception('No current content type has been defined in the context');
         }
 
         return $this->currentContentType;
diff --git a/src/lib/Behat/Context/FieldTypeFormContext.php b/src/lib/Behat/Context/FieldTypeFormContext.php
index fbeff7ea..c3a9aea5 100644
--- a/src/lib/Behat/Context/FieldTypeFormContext.php
+++ b/src/lib/Behat/Context/FieldTypeFormContext.php
@@ -37,8 +37,8 @@ public function gatherContexts(BeforeScenarioScope $scope)
     }
 
     /**
-     * @Given a Content Type with a(n) :fieldTypeIdentifier field definition
-     * @Given a Content Type :contentTypeName with a(n) :fieldTypeIdentifier field definition
+     * @Given a content type with a(n) :fieldTypeIdentifier field definition
+     * @Given a content type :contentTypeName with a(n) :fieldTypeIdentifier field definition
      */
     public function aContentTypeWithAGivenFieldDefinition($fieldTypeIdentifier, $contentTypeName = null)
     {
diff --git a/src/lib/Behat/Context/UserRegistrationContext.php b/src/lib/Behat/Context/UserRegistrationContext.php
index c914e68f..d743d55b 100644
--- a/src/lib/Behat/Context/UserRegistrationContext.php
+++ b/src/lib/Behat/Context/UserRegistrationContext.php
@@ -204,7 +204,7 @@ public function iCanSeeTheRegistrationForm()
     }
 
     /**
-     * @Given /^it matches the structure of the configured registration user Content Type$/
+     * @Given /^it matches the structure of the configured registration user content type$/
      */
     public function itMatchesTheStructureOfTheConfiguredRegistrationUserContentType()
     {
diff --git a/src/lib/Content/View/Builder/ContentCreateViewBuilder.php b/src/lib/Content/View/Builder/ContentCreateViewBuilder.php
index c88100c2..458ded45 100644
--- a/src/lib/Content/View/Builder/ContentCreateViewBuilder.php
+++ b/src/lib/Content/View/Builder/ContentCreateViewBuilder.php
@@ -122,7 +122,7 @@ private function resolveContentType(array $parameters, array $languageCodes): Co
 
         throw new InvalidArgumentException(
             'ContentType',
-            'No Content Type could be loaded from the parameters'
+            'No content type could be loaded from the parameters'
         );
     }