diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/AttributeReleasePolicyTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/AttributeReleasePolicyTypeTest.php
index 986e970180..ca1601332c 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/AttributeReleasePolicyTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/AttributeReleasePolicyTypeTest.php
@@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function AttributeReleasePolicy_converted_to_json()
+    public function attribute_release_policy_converted_to_json()
     {
         $arpType = Type::getType(AttributeReleasePolicyType::NAME);
         $arp = array();
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/CertificateArrayTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/CertificateArrayTypeTest.php
index 10ed7116ce..d3c3db6ad4 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/CertificateArrayTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/CertificateArrayTypeTest.php
@@ -73,7 +73,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function CertificateArrayType_converted_to_json()
+    public function certificate_array_type_converted_to_json()
     {
         $certType = Type::getType(CertificateArrayType::NAME);
         $certificateArray = [new X509CertificateLazyProxy(new X509CertificateFactory(), $this->certData)];
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ContactPersonArrayTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ContactPersonArrayTypeTest.php
index becfc76a3a..ebf879fd62 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ContactPersonArrayTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ContactPersonArrayTypeTest.php
@@ -69,7 +69,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function ContactPersonArrayType_converted_to_json()
+    public function contact_person_array_type_converted_to_json()
     {
         $contactPersonType = Type::getType(ContactPersonArrayType::NAME);
         $contactPerson = [new ContactPerson("support")];
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/IndexedServiceArrayTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/IndexedServiceArrayTypeTest.php
index 4e7e4109ba..5fb215c630 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/IndexedServiceArrayTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/IndexedServiceArrayTypeTest.php
@@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function IndexedServiceArrayType_converted_to_json()
+    public function indexed_service_array_type_converted_to_json()
     {
         $indexedServiceArrayType = Type::getType(IndexedServiceArrayType::NAME);
         $serviceIndex = [new IndexedService("location", "binding", 0)];
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/LogoTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/LogoTypeTest.php
index 20669dc552..8b58430e8f 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/LogoTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/LogoTypeTest.php
@@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function LogoType_converted_to_json()
+    public function logo_type_converted_to_json()
     {
         $logoType = Type::getType(LogoType::NAME);
         $logo = new Logo("location");
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/OrganizationTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/OrganizationTypeTest.php
index fcc6d6ac84..a33b166d95 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/OrganizationTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/OrganizationTypeTest.php
@@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function OrganizationType_converted_to_json()
+    public function organization_type_converted_to_json()
     {
         $organizationType = Type::getType(OrganizationType::NAME);
         $organization = new Organization("name", "displayName", "url");
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/RequestedAttributeArrayTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/RequestedAttributeArrayTypeTest.php
index 5ecb4deba7..37ed5aa82c 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/RequestedAttributeArrayTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/RequestedAttributeArrayTypeTest.php
@@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function RequestedAttributeArrayType_converted_to_json()
+    public function requested_attribute_array_type_converted_to_json()
     {
         $requestedAttributeArrayType = Type::getType(RequestedAttributeArrayType::NAME);
         $requestedAttribute = [new RequestedAttribute("name")];
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ServiceArrayTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ServiceArrayTypeTest.php
index 554e03588c..c22a3712aa 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ServiceArrayTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ServiceArrayTypeTest.php
@@ -70,11 +70,11 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function ServiceArrayType_converted_to_json()
+    public function service_array_type_converted_to_json()
     {
-        $ServiceArrayType = Type::getType(ServiceArrayType::NAME);
+        $serviceArrayType = Type::getType(ServiceArrayType::NAME);
         $serviceArray = [new Service("location", "binding")];
-        $value = $ServiceArrayType->convertToDatabaseValue($serviceArray, $this->platform);
+        $value = $serviceArrayType->convertToDatabaseValue($serviceArray, $this->platform);
 
         $this->assertEquals(json_encode($serviceArray), $value);
     }
@@ -86,9 +86,9 @@ public function ServiceArrayType_converted_to_json()
      */
     public function a_null_value_is_converted_to_null()
     {
-        $ServiceArrayType = Type::getType(ServiceArrayType::NAME);
+        $serviceArrayType = Type::getType(ServiceArrayType::NAME);
 
-        $value = $ServiceArrayType->convertToPHPValue(null, $this->platform);
+        $value = $serviceArrayType->convertToPHPValue(null, $this->platform);
 
         $this->assertNull($value);
     }
@@ -100,10 +100,10 @@ public function a_null_value_is_converted_to_null()
      */
     public function saved_object_equals_result()
     {
-        $ServiceArrayType = Type::getType(ServiceArrayType::NAME);
+        $serviceArrayType = Type::getType(ServiceArrayType::NAME);
         $serviceArray = [new Service("location", "binding")];
 
-        $value = $ServiceArrayType->convertToPHPValue($ServiceArrayType->convertToDatabaseValue($serviceArray, $this->platform),
+        $value = $serviceArrayType->convertToPHPValue($serviceArrayType->convertToDatabaseValue($serviceArray, $this->platform),
             $this->platform);
 
         $this->assertEquals($serviceArray, $value);
@@ -116,10 +116,10 @@ public function saved_object_equals_result()
      */
     public function an_invalid_php_value_causes_an_exception_upon_conversion()
     {
-        $ServiceArrayType = Type::getType(ServiceArrayType::NAME);
+        $serviceArrayType = Type::getType(ServiceArrayType::NAME);
 
         $this->expectException(ConversionException::class);
-        $ServiceArrayType->convertToDatabaseValue(false, $this->platform);
+        $serviceArrayType->convertToDatabaseValue(false, $this->platform);
     }
 
     /**
@@ -129,9 +129,9 @@ public function an_invalid_php_value_causes_an_exception_upon_conversion()
      */
     public function an_invalid_database_value_causes_an_exception_upon_conversion()
     {
-        $ServiceArrayType = Type::getType(ServiceArrayType::NAME);
+        $serviceArrayType = Type::getType(ServiceArrayType::NAME);
 
         $this->expectException(ConversionException::class);
-        $ServiceArrayType->convertToPHPValue(false, $this->platform);
+        $serviceArrayType->convertToPHPValue(false, $this->platform);
     }
 }
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ShibMdScopeArrayTypeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ShibMdScopeArrayTypeTest.php
index ff73633cce..ea67fb29a3 100644
--- a/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ShibMdScopeArrayTypeTest.php
+++ b/tests/unit/OpenConext/EngineBlockBundle/Doctrine/Type/ShibMdScopeArrayTypeTest.php
@@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion()
      * @group EngineBlockBundle
      * @group Doctrine
      */
-    public function ShibMdScopeArrayType_converted_to_json()
+    public function shib_md_scope_array_type_converted_to_json()
     {
         $shibMdScopeArrayType = Type::getType(ShibMdScopeArrayType::NAME);
         $shibMdScopeArray = [new ShibMdScope()];