diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt
index 321a66748..4990888ea 100644
--- a/core/tests/CMakeLists.txt
+++ b/core/tests/CMakeLists.txt
@@ -20,16 +20,19 @@
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-add_midas_style_test( StyleCoreAppController ${CMAKE_SOURCE_DIR}/core/AppController.php )
-add_midas_style_test( StyleCoreGlobalController ${CMAKE_SOURCE_DIR}/core/GlobalController.php )
-add_midas_style_test( StyleCoreGlobalComponent ${CMAKE_SOURCE_DIR}/core/GlobalComponent.php )
+add_midas_style_test( StyleCoreApiController ${CMAKE_SOURCE_DIR}/core/ApiController.php )
 add_midas_style_test( StyleCoreAppComponent ${CMAKE_SOURCE_DIR}/core/AppComponent.php )
-add_midas_style_test( StyleCoreAppFilters ${CMAKE_SOURCE_DIR}/core/AppFilters.php )
+add_midas_style_test( StyleCoreAppController ${CMAKE_SOURCE_DIR}/core/AppController.php )
 add_midas_style_test( StyleCoreAppForm ${CMAKE_SOURCE_DIR}/core/AppForm.php )
 add_midas_style_test( StyleCoreBootstrap ${CMAKE_SOURCE_DIR}/core/Bootstrap.php )
+add_midas_style_test( StyleCoreComponentLoader ${CMAKE_SOURCE_DIR}/core/ComponentLoader.php )
+add_midas_style_test( StyleCoreConstant ${CMAKE_SOURCE_DIR}/core/constant )
+add_midas_style_test( StyleCoreGlobalComponent ${CMAKE_SOURCE_DIR}/core/GlobalComponent.php )
+add_midas_style_test( StyleCoreGlobalController ${CMAKE_SOURCE_DIR}/core/GlobalController.php )
 add_midas_style_test( StyleCoreInclude ${CMAKE_SOURCE_DIR}/core/include.php )
+add_midas_style_test( StyleCoreMidasLoader ${CMAKE_SOURCE_DIR}/core/MidasLoader.php )
+add_midas_style_test( StyleCoreNotification ${CMAKE_SOURCE_DIR}/core/Notification.php )
 add_midas_style_test( StyleIndex ${CMAKE_SOURCE_DIR}/index.php )
 
-
-add_midas_style_test( StyleTestsCoreControllers ${CMAKE_SOURCE_DIR}/core/tests/controllers )
-add_midas_style_test( StyleTestsCoreModels ${CMAKE_SOURCE_DIR}/core/tests/models )
+add_midas_style_test( StyleCoreTestsControllers ${CMAKE_SOURCE_DIR}/core/tests/controllers )
+add_midas_style_test( StyleCoreTestsModels ${CMAKE_SOURCE_DIR}/core/tests/models )
diff --git a/core/tests/models/CMakeLists.txt b/core/tests/models/CMakeLists.txt
index f07ff7ebe..668d72696 100644
--- a/core/tests/models/CMakeLists.txt
+++ b/core/tests/models/CMakeLists.txt
@@ -32,4 +32,4 @@ add_midas_style_test( StyleCoreMIDASDatabaseMongo ${CMAKE_SOURCE_DIR}/core/model
 add_midas_style_test( StyleCoreMIDASDatabaseInterface ${CMAKE_SOURCE_DIR}/core/models/MIDASDatabaseInterface.php )
 add_midas_style_test( StyleCoreMIDASModel ${CMAKE_SOURCE_DIR}/core/models/MIDASModel.php )
 add_midas_style_test( StyleCoreMIDASUpgrade ${CMAKE_SOURCE_DIR}/core/models/MIDASUpgrade.php )
-add_midas_style_test( StyleCoreProductionDbProfiler ${CMAKE_SOURCE_DIR}/core/models/prfiler/ProductionDbProfiler.php )
+add_midas_style_test( StyleCoreProductionDbProfiler ${CMAKE_SOURCE_DIR}/core/models/profiler/ProductionDbProfiler.php )
diff --git a/modules/api/tests/CMakeLists.txt b/modules/api/tests/CMakeLists.txt
index 36c1577bb..cc8a85ee2 100644
--- a/modules/api/tests/CMakeLists.txt
+++ b/modules/api/tests/CMakeLists.txt
@@ -17,10 +17,15 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name api )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-# Style
-add_midas_style_test( StyleApiControllers ${CMAKE_SOURCE_DIR}/modules/api/controllers )
-add_midas_style_test( StyleTestsApiControllers ${CMAKE_SOURCE_DIR}/modules/api/tests/controllers )
-add_midas_style_test(StyleApiEnabledNotification
-${CMAKE_SOURCE_DIR}/modules/api/library/APIEnabledNotification.php)
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}EnabledNotification ${CMAKE_SOURCE_DIR}/modules/${module_name}/library/APIEnabledNotification.php)
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/archive/tests/CMakeLists.txt b/modules/archive/tests/CMakeLists.txt
index ab9e0a411..6f2827a44 100644
--- a/modules/archive/tests/CMakeLists.txt
+++ b/modules/archive/tests/CMakeLists.txt
@@ -17,9 +17,14 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name archive )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-# Style
-add_midas_style_test( StyleArchiveControllers ${CMAKE_SOURCE_DIR}/modules/archive/controllers )
-add_midas_style_test( StyleTestsArchiveControllers ${CMAKE_SOURCE_DIR}/modules/archive/tests/controllers )
-add_midas_style_test( StyleArchiveNotification ${CMAKE_SOURCE_DIR}/modules/archive/Notification.php )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/batchmake/tests/CMakeLists.txt b/modules/batchmake/tests/CMakeLists.txt
index 856e12980..cfe13cf95 100644
--- a/modules/batchmake/tests/CMakeLists.txt
+++ b/modules/batchmake/tests/CMakeLists.txt
@@ -17,27 +17,23 @@
 # limitations under the License.
 #=============================================================================
 
-option( MIDAS_RUN_BATCHMAKE_TESTS "Should MIDAS run BatchMake tests?  Specific configuration is required, see modules/batchmake/tests/README." )
-if(MIDAS_RUN_BATCHMAKE_TESTS)
+set( module_name batchmake )
+to_titlecase( ${module_name} module_name_titlecase )
+
+option( MIDAS_RUN_BATCHMAKE_TESTS "Should MIDAS run BatchMake tests? Specific configuration is required, see modules/batchmake/tests/README." )
 
-  # functionality tests will be added by the subdirectories 
+if(MIDAS_RUN_BATCHMAKE_TESTS)
   add_subdirectory( models )
   add_subdirectory( controllers )
+endif()
 
-  # Style tests for code
-  add_midas_style_test( StyleBatchmakeControllers ${CMAKE_SOURCE_DIR}/modules/batchmake/controllers )
-  add_midas_style_test( StyleBatchmakeLibrary ${CMAKE_SOURCE_DIR}/modules/batchmake/library )
-
-  add_midas_style_test( StyleBatchmakeModels ${CMAKE_SOURCE_DIR}/modules/batchmake/models )
-  add_midas_style_test( StyleBatchmakeModelsBase ${CMAKE_SOURCE_DIR}/modules/batchmake/models/base )
-  add_midas_style_test( StyleBatchmakeModelsDAO ${CMAKE_SOURCE_DIR}/modules/batchmake/models/dao )
-  add_midas_style_test( StyleBatchmakeModelPDO ${CMAKE_SOURCE_DIR}/modules/batchmake/models/pdo )
-
-  # Style tests for test code
-  add_midas_style_test( StyleTestsBatchmakeControllers ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/controllers )
-  add_midas_style_test( StyleTestsBatchmakeComponents ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/controllers/components )
-  add_midas_style_test( StyleTestsBatchmakeLibrary ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/library )
-  add_midas_style_test( StyleTestsBatchmakeModels ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/models )
-  add_midas_style_test( StyleTestsBatchmakeModelsBase ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/models/base )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Library ${CMAKE_SOURCE_DIR}/modules/${module_name}/library )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
 
-endif()
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}TestsLibrary ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/library )
+add_midas_style_test( Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models )
diff --git a/modules/cleanup/tests/CMakeLists.txt b/modules/cleanup/tests/CMakeLists.txt
index 85a6245e9..218cdcc8a 100644
--- a/modules/cleanup/tests/CMakeLists.txt
+++ b/modules/cleanup/tests/CMakeLists.txt
@@ -17,8 +17,15 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name cleanup )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-add_midas_style_test( StyleCleanupControllers ${CMAKE_SOURCE_DIR}/modules/cleanup/controllers )
-add_midas_style_test( StyleCleanupModels ${CMAKE_SOURCE_DIR}/modules/cleanup/models )
-add_midas_style_test( StyleCleanupNotification ${CMAKE_SOURCE_DIR}/modules/cleanup/Notification.php )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/comments/tests/CMakeLists.txt b/modules/comments/tests/CMakeLists.txt
index da286cb0d..9d61d29fa 100644
--- a/modules/comments/tests/CMakeLists.txt
+++ b/modules/comments/tests/CMakeLists.txt
@@ -17,7 +17,11 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name comments )
+to_titlecase( ${module_name} module_name_titlecase )
 
-add_midas_style_test( StyleCommentsControllers ${CMAKE_SOURCE_DIR}/modules/comments/controllers )
-add_midas_style_test( StyleCommentsModels ${CMAKE_SOURCE_DIR}/modules/comments/models )
-add_midas_style_test( StyleCommentsNotification ${CMAKE_SOURCE_DIR}/modules/comments/Notification.php )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/communityagreement/tests/CMakeLists.txt b/modules/communityagreement/tests/CMakeLists.txt
index bbb4d871a..baeb0d60c 100644
--- a/modules/communityagreement/tests/CMakeLists.txt
+++ b/modules/communityagreement/tests/CMakeLists.txt
@@ -17,9 +17,17 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name communityagreement )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-add_midas_style_test( StyleCommunityagreementNotification ${CMAKE_SOURCE_DIR}/modules/communityagreement/Notification.php )
-add_midas_style_test( StyleTestsCommunityagreementControllers ${CMAKE_SOURCE_DIR}/modules/communityagreement/tests/controllers )
-add_midas_style_test( StyleTestsCommunityagreementModels ${CMAKE_SOURCE_DIR}/modules/communityagreement/tests/models )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models )
diff --git a/modules/communityagreement/tests/controllers/CMakeLists.txt b/modules/communityagreement/tests/controllers/CMakeLists.txt
index b7734b484..22bcc9091 100644
--- a/modules/communityagreement/tests/controllers/CMakeLists.txt
+++ b/modules/communityagreement/tests/controllers/CMakeLists.txt
@@ -18,6 +18,3 @@
 #=============================================================================
 
 add_midas_test( CommunityagreementConfigController ConfigControllerTest.php )
-
-# Style
-add_midas_style_test( StyleCommunityagreementControllers ${CMAKE_SOURCE_DIR}/modules/communityagreement/controllers )
diff --git a/modules/communityagreement/tests/models/CMakeLists.txt b/modules/communityagreement/tests/models/CMakeLists.txt
index 73918918f..11245b04f 100644
--- a/modules/communityagreement/tests/models/CMakeLists.txt
+++ b/modules/communityagreement/tests/models/CMakeLists.txt
@@ -18,8 +18,3 @@
 #=============================================================================
 
 add_subdirectory( base )
-
-#Style
-add_midas_style_test( StyleCommunityagreementModelsBase ${CMAKE_SOURCE_DIR}/modules/communityagreement/models/base/ )
-add_midas_style_test( StyleCommunityagreementModelsPdo ${CMAKE_SOURCE_DIR}/modules/communityagreement/models/pdo/ )
-add_midas_style_test( StyleCommunityagreementModelsDao ${CMAKE_SOURCE_DIR}/modules/communityagreement/models/dao/ )
diff --git a/modules/sizequota/tests/models/base/CMakeLists.txt b/modules/dicomanonymize/tests/CMakeLists.txt
similarity index 60%
rename from modules/sizequota/tests/models/base/CMakeLists.txt
rename to modules/dicomanonymize/tests/CMakeLists.txt
index 94ed4d58d..6767bfcfe 100644
--- a/modules/sizequota/tests/models/base/CMakeLists.txt
+++ b/modules/dicomanonymize/tests/CMakeLists.txt
@@ -16,3 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #=============================================================================
+
+set( module_name dicomanonymize )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/sizequota/tests/models/CMakeLists.txt b/modules/dicomextractor/tests/CMakeLists.txt
similarity index 65%
rename from modules/sizequota/tests/models/CMakeLists.txt
rename to modules/dicomextractor/tests/CMakeLists.txt
index 11245b04f..82e1a8afd 100644
--- a/modules/sizequota/tests/models/CMakeLists.txt
+++ b/modules/dicomextractor/tests/CMakeLists.txt
@@ -17,4 +17,9 @@
 # limitations under the License.
 #=============================================================================
 
-add_subdirectory( base )
+set( module_name dicomextractor )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
diff --git a/modules/dicomserver/tests/CMakeLists.txt b/modules/dicomserver/tests/CMakeLists.txt
new file mode 100644
index 000000000..ddbb965c0
--- /dev/null
+++ b/modules/dicomserver/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name dicomserver )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+# add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )  # FIXME
diff --git a/modules/example/tests/CMakeLists.txt b/modules/example/tests/CMakeLists.txt
index 78d5130c0..b2d4bdebc 100644
--- a/modules/example/tests/CMakeLists.txt
+++ b/modules/example/tests/CMakeLists.txt
@@ -17,9 +17,10 @@
 # limitations under the License.
 #=============================================================================
 
-# Style tests for code
-add_midas_style_test( StyleExampleControllers ${CMAKE_SOURCE_DIR}/modules/example/controllers )
-add_midas_style_test( StyleExampleModels ${CMAKE_SOURCE_DIR}/modules/example/models )
-add_midas_style_test( StyleExampleModelsBase ${CMAKE_SOURCE_DIR}/modules/example/models/base )
-add_midas_style_test( StyleExampleModelsDAO ${CMAKE_SOURCE_DIR}/modules/example/models/dao )
-add_midas_style_test( StyleExampleModelPDO ${CMAKE_SOURCE_DIR}/modules/example/models/pdo )
+set( module_name example )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
diff --git a/modules/keyfiles/tests/CMakeLists.txt b/modules/keyfiles/tests/CMakeLists.txt
index 1a4a6d023..d7ac6c60a 100644
--- a/modules/keyfiles/tests/CMakeLists.txt
+++ b/modules/keyfiles/tests/CMakeLists.txt
@@ -17,8 +17,15 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name keyfiles )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-add_midas_style_test( StyleKeyfilesControllers ${CMAKE_SOURCE_DIR}/modules/keyfiles/controllers )
-add_midas_style_test( StyleKeyfilesModels ${CMAKE_SOURCE_DIR}/modules/keyfiles/models )
-add_midas_style_test( StyleKeyfilesNotification ${CMAKE_SOURCE_DIR}/modules/keyfiles/Notification.php )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/thumbnailcreator/tests/controllers/CMakeLists.txt b/modules/landingpage/tests/CMakeLists.txt
similarity index 60%
rename from modules/thumbnailcreator/tests/controllers/CMakeLists.txt
rename to modules/landingpage/tests/CMakeLists.txt
index 2e588f118..618c52276 100644
--- a/modules/thumbnailcreator/tests/controllers/CMakeLists.txt
+++ b/modules/landingpage/tests/CMakeLists.txt
@@ -17,5 +17,10 @@
 # limitations under the License.
 #=============================================================================
 
-# Style
-add_midas_style_test( StyleThumbnailcreatorControllers ${CMAKE_SOURCE_DIR}/modules/thumbnailcreator/controllers )
+set( module_name landingpage )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/ldap/tests/CMakeLists.txt b/modules/ldap/tests/CMakeLists.txt
new file mode 100644
index 000000000..3037a4411
--- /dev/null
+++ b/modules/ldap/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name ldap )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/metadataextractor/tests/CMakeLists.txt b/modules/metadataextractor/tests/CMakeLists.txt
new file mode 100644
index 000000000..1c3822397
--- /dev/null
+++ b/modules/metadataextractor/tests/CMakeLists.txt
@@ -0,0 +1,26 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name metadataextractor )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/mfa/tests/CMakeLists.txt b/modules/mfa/tests/CMakeLists.txt
new file mode 100644
index 000000000..64d6b06bf
--- /dev/null
+++ b/modules/mfa/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name mfa )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/oai/tests/CMakeLists.txt b/modules/oai/tests/CMakeLists.txt
index b41d95df7..c2b09bce1 100644
--- a/modules/oai/tests/CMakeLists.txt
+++ b/modules/oai/tests/CMakeLists.txt
@@ -17,6 +17,14 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name oai )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-add_midas_style_test( StyleTestsOaiControllers ${CMAKE_SOURCE_DIR}/modules/oai/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/oai/tests/controllers/CMakeLists.txt b/modules/oai/tests/controllers/CMakeLists.txt
index bb80cc904..c8536ff9f 100644
--- a/modules/oai/tests/controllers/CMakeLists.txt
+++ b/modules/oai/tests/controllers/CMakeLists.txt
@@ -18,6 +18,3 @@
 #=============================================================================
 
 add_midas_test( OaiIndexController IndexControllerTest.php )
-
-# Syle
-add_midas_style_test( StyleOaiControllers ${CMAKE_SOURCE_DIR}/modules/oai/controllers )
diff --git a/modules/oauth/tests/CMakeLists.txt b/modules/oauth/tests/CMakeLists.txt
index f53aec76e..dbf28d8c2 100644
--- a/modules/oauth/tests/CMakeLists.txt
+++ b/modules/oauth/tests/CMakeLists.txt
@@ -17,8 +17,15 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name oauth )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-add_midas_style_test( StyleOauthControllers ${CMAKE_SOURCE_DIR}/modules/oauth/controllers )
-add_midas_style_test( StyleOauthModels ${CMAKE_SOURCE_DIR}/modules/oauth/models )
-add_midas_style_test( StyleOauthNotification ${CMAKE_SOURCE_DIR}/modules/oauth/Notification.php )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+# add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )  # FIXME
diff --git a/modules/packages/tests/CMakeLists.txt b/modules/packages/tests/CMakeLists.txt
index 615ac54ff..f056045c8 100644
--- a/modules/packages/tests/CMakeLists.txt
+++ b/modules/packages/tests/CMakeLists.txt
@@ -17,8 +17,17 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name packages )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-add_midas_style_test( StylePackagesControllers ${CMAKE_SOURCE_DIR}/modules/packages/controllers )
-add_midas_style_test( StylePackagesModels ${CMAKE_SOURCE_DIR}/modules/packages/models )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+# add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )  # FIXME
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models )
diff --git a/modules/pvw/tests/CMakeLists.txt b/modules/pvw/tests/CMakeLists.txt
new file mode 100644
index 000000000..ec0b6d99d
--- /dev/null
+++ b/modules/pvw/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name pvw )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/ratings/tests/CMakeLists.txt b/modules/ratings/tests/CMakeLists.txt
index 1ca1928d8..59ad09c59 100644
--- a/modules/ratings/tests/CMakeLists.txt
+++ b/modules/ratings/tests/CMakeLists.txt
@@ -17,6 +17,11 @@
 # limitations under the License.
 #=============================================================================
 
-add_midas_style_test( StyleRatingsControllers ${CMAKE_SOURCE_DIR}/modules/ratings/controllers )
-add_midas_style_test( StyleRatingsModels ${CMAKE_SOURCE_DIR}/modules/ratings/models )
-add_midas_style_test( StyleRatingsNotification ${CMAKE_SOURCE_DIR}/modules/ratings/Notification.php )
+set( module_name ratings )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/readmes/tests/CMakeLists.txt b/modules/readmes/tests/CMakeLists.txt
index eeac8fc9d..092f3adf0 100644
--- a/modules/readmes/tests/CMakeLists.txt
+++ b/modules/readmes/tests/CMakeLists.txt
@@ -17,7 +17,14 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name readmes )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-add_midas_style_test( StyleReadmesNotification ${CMAKE_SOURCE_DIR}/modules/communityagreement/Notification.php )
-add_midas_style_test( StyleTestsReadmesControllers ${CMAKE_SOURCE_DIR}/modules/communityagreement/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/readmes/tests/controllers/CMakeLists.txt b/modules/readmes/tests/controllers/CMakeLists.txt
index 569313b03..304bd0645 100644
--- a/modules/readmes/tests/controllers/CMakeLists.txt
+++ b/modules/readmes/tests/controllers/CMakeLists.txt
@@ -18,6 +18,3 @@
 #=============================================================================
 
 add_midas_test( ReadmesApi ReadmesApiTest.php )
-
-# Style
-add_midas_style_test( StyleReadmesControllers ${CMAKE_SOURCE_DIR}/modules/readmes/controllers )
diff --git a/modules/remoteprocessing/tests/CMakeLists.txt b/modules/remoteprocessing/tests/CMakeLists.txt
index 6efcdc311..140aebbbd 100644
--- a/modules/remoteprocessing/tests/CMakeLists.txt
+++ b/modules/remoteprocessing/tests/CMakeLists.txt
@@ -17,10 +17,19 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name remoteprocessing )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-add_midas_mysql_test( RemoteprocessingApi ApiTest.php )
+add_midas_mysql_test( ${module_name_titlecase}Api ApiTest.php )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
 
-add_midas_style_test( StyleTestsRemoteprocessingControllers ${CMAKE_SOURCE_DIR}/modules/remoteprocessing/tests/controllers )
-add_midas_style_test( StyleTestsRemoteprocessingModels ${CMAKE_SOURCE_DIR}/modules/remoteprocessing/tests/models )
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models )
diff --git a/modules/remoteprocessing/tests/controllers/CMakeLists.txt b/modules/remoteprocessing/tests/controllers/CMakeLists.txt
index 2481617ea..04a532a9d 100644
--- a/modules/remoteprocessing/tests/controllers/CMakeLists.txt
+++ b/modules/remoteprocessing/tests/controllers/CMakeLists.txt
@@ -20,6 +20,3 @@
 #add_midas_mysql_test( RemoteprocessingJobController JobControllerTest.php )
 #add_midas_mysql_test( RemoteprocessingExecutableController ExecutableControllerTest.php )
 add_midas_mysql_test( RemoteprocessingConfigController ConfigControllerTest.php )
-
-# Style
-add_midas_style_test( StyleRemoteprocessingControllers ${CMAKE_SOURCE_DIR}/modules/remoteprocessing/controllers )
diff --git a/modules/remoteprocessing/tests/models/CMakeLists.txt b/modules/remoteprocessing/tests/models/CMakeLists.txt
index 7b31f4a4b..11245b04f 100644
--- a/modules/remoteprocessing/tests/models/CMakeLists.txt
+++ b/modules/remoteprocessing/tests/models/CMakeLists.txt
@@ -18,8 +18,3 @@
 #=============================================================================
 
 add_subdirectory( base )
-
-#Style
-add_midas_style_test( StyleRemoteprocessingModelsBase ${CMAKE_SOURCE_DIR}/modules/remoteprocessing/models/base/ )
-add_midas_style_test( StyleRemoteprocessingModelsPdo ${CMAKE_SOURCE_DIR}/modules/remoteprocessing/models/pdo/ )
-add_midas_style_test( StyleRemoteprocessingModelsDao ${CMAKE_SOURCE_DIR}/modules/remoteprocessing/models/dao/ )
diff --git a/modules/scheduler/tests/CMakeLists.txt b/modules/scheduler/tests/CMakeLists.txt
new file mode 100644
index 000000000..5072fa976
--- /dev/null
+++ b/modules/scheduler/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name scheduler )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/sizequota/tests/CMakeLists.txt b/modules/sizequota/tests/CMakeLists.txt
index ea8f7ba31..886b8e02d 100644
--- a/modules/sizequota/tests/CMakeLists.txt
+++ b/modules/sizequota/tests/CMakeLists.txt
@@ -17,12 +17,15 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name sizequota )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
-add_subdirectory( models )
 
-# Style
-add_midas_style_test( StyleSizequotaControllers ${CMAKE_SOURCE_DIR}/modules/sizequota/controllers )
-add_midas_style_test( StyleSizequotaModels ${CMAKE_SOURCE_DIR}/modules/sizequota/models )
-add_midas_style_test( StyleSizequotaNotification ${CMAKE_SOURCE_DIR}/modules/sizequota/Notification.php )
-add_midas_style_test( StyleTestsSizequotaControllers ${CMAKE_SOURCE_DIR}/modules/sizequota/tests/controllers )
-add_midas_style_test( StyleTestsSizequotaModels ${CMAKE_SOURCE_DIR}/modules/sizequota/tests/models )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
diff --git a/modules/solr/tests/CMakeLists.txt b/modules/solr/tests/CMakeLists.txt
new file mode 100644
index 000000000..533e8f278
--- /dev/null
+++ b/modules/solr/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name solr )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+# add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )  # FIXME
diff --git a/modules/statistics/tests/CMakeLists.txt b/modules/statistics/tests/CMakeLists.txt
index 4abf683f8..72c69aea5 100644
--- a/modules/statistics/tests/CMakeLists.txt
+++ b/modules/statistics/tests/CMakeLists.txt
@@ -17,10 +17,17 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name statistics )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-# Style
-add_midas_style_test( StyleStatisticsControllers ${CMAKE_SOURCE_DIR}/modules/statistics/controllers )
-add_midas_style_test( StyleStatisticsModels ${CMAKE_SOURCE_DIR}/modules/statistics/models )
-add_midas_style_test( StyleStatisticsNotification ${CMAKE_SOURCE_DIR}/modules/statistics/Notification.php )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models )
diff --git a/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php b/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php
index 9e5d11e30..5c0ff3b68 100644
--- a/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php
+++ b/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php
@@ -88,6 +88,6 @@ public function testGeolocationTask()
     $this->assertEquals(count($logs), 1);
     $this->assertTrue(strpos($logs[0]->getLog(), 'IpInfoDb lookup failed') !== false);
 
-    print "Log = ".$logs[0]->getLog();
+    echo "Log = ".$logs[0]->getLog();
     }
   }
diff --git a/modules/thumbnailcreator/tests/CMakeLists.txt b/modules/thumbnailcreator/tests/CMakeLists.txt
index 4531db2a0..0b5e44f0f 100644
--- a/modules/thumbnailcreator/tests/CMakeLists.txt
+++ b/modules/thumbnailcreator/tests/CMakeLists.txt
@@ -17,7 +17,11 @@
 # limitations under the License.
 #=============================================================================
 
-add_subdirectory( controllers )
+set( module_name thumbnailcreator )
+to_titlecase( ${module_name} module_name_titlecase )
 
-add_midas_style_test( StyleTestsThumbnailcreatorControllers ${CMAKE_SOURCE_DIR}/modules/thumbnailcreator/tests/controllers )
-  
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/tracker/tests/CMakeLists.txt b/modules/tracker/tests/CMakeLists.txt
new file mode 100644
index 000000000..8de9f6d8e
--- /dev/null
+++ b/modules/tracker/tests/CMakeLists.txt
@@ -0,0 +1,27 @@
+#=============================================================================
+# MIDAS Server
+# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+# All rights reserved.
+# More information http://www.kitware.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set( module_name tracker )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+# add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )  # FIXME
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
diff --git a/modules/validation/tests/CMakeLists.txt b/modules/validation/tests/CMakeLists.txt
index 6673c1576..2f35ad126 100644
--- a/modules/validation/tests/CMakeLists.txt
+++ b/modules/validation/tests/CMakeLists.txt
@@ -17,10 +17,17 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name validation )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-add_midas_style_test( StyleValidationControllers ${CMAKE_SOURCE_DIR}/modules/validation/controllers )
-add_midas_style_test( StyleValidationModels ${CMAKE_SOURCE_DIR}/modules/validation/models )
-add_midas_style_test( StyleTestsValidationControllers ${CMAKE_SOURCE_DIR}/modules/validation/tests/controllers )
-add_midas_style_test( StyleTestsValidationModels ${CMAKE_SOURCE_DIR}/modules/validation/tests/models )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}TestsModels ${CMAKE_SOURCE_DIR}/modules/${module_name}/tests/models )
diff --git a/modules/visualize/tests/CMakeLists.txt b/modules/visualize/tests/CMakeLists.txt
index cfb298356..31cae88cd 100644
--- a/modules/visualize/tests/CMakeLists.txt
+++ b/modules/visualize/tests/CMakeLists.txt
@@ -17,7 +17,15 @@
 # limitations under the License.
 #=============================================================================
 
+set( module_name visualize )
+to_titlecase( ${module_name} module_name_titlecase )
+
 add_subdirectory( controllers )
 
-add_midas_style_test( StyleVisualizeNotification ${CMAKE_SOURCE_DIR}/modules/visualize/Notification.php )
-add_midas_style_test( StyleTestsVisualizeControllers ${CMAKE_SOURCE_DIR}/modules/visualize/tests/controllers )
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )
+
+add_midas_style_test( Style${module_name_titlecase}TestsControllers ${CMAKE_SOURCE_DIR}/modules/visualize/tests/controllers )
diff --git a/modules/visualize/tests/controllers/CMakeLists.txt b/modules/visualize/tests/controllers/CMakeLists.txt
index 56acb8db2..4f567ba6e 100644
--- a/modules/visualize/tests/controllers/CMakeLists.txt
+++ b/modules/visualize/tests/controllers/CMakeLists.txt
@@ -19,6 +19,3 @@
 
 add_midas_test( VisualizeWrapperController WrapperControllerTest.php )
 add_midas_test( VisualizeIndexController IndexControllerTest.php )
-
-# Style
-add_midas_style_test( StyleVisualizeControllers ${CMAKE_SOURCE_DIR}/modules/visualize/controllers )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6e3f36d53..7ef5e8141 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -37,6 +37,13 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/xdebugCoverage)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/xdebugCoverage)
 endif()
 
+macro(to_titlecase Arg Result)
+  string(SUBSTRING ${Arg} 0 1 ArgHead)
+  string(TOUPPER ${ArgHead} ArgHead)
+  string(SUBSTRING ${Arg} 1 -1 ArgTail)
+  set(${Result} ${ArgHead}${ArgTail})
+endmacro(to_titlecase)
+
 function(add_midas_test TestName TestFile)
   add_midas_mysql_test(${TestName} ${TestFile})
   add_midas_pgsql_test(${TestName} ${TestFile})
diff --git a/utils/moduleTemplate/tests/CMakeLists.txt b/utils/moduleTemplate/tests/CMakeLists.txt
index 94ed4d58d..8ccb84bf4 100644
--- a/utils/moduleTemplate/tests/CMakeLists.txt
+++ b/utils/moduleTemplate/tests/CMakeLists.txt
@@ -16,3 +16,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #=============================================================================
+
+set( module_name @MN@ )
+to_titlecase( ${module_name} module_name_titlecase )
+
+add_subdirectory( controllers )
+
+add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
+add_midas_style_test( Style${module_name_titlecase}Controllers ${CMAKE_SOURCE_DIR}/modules/${module_name}/controllers )
+add_midas_style_test( Style${module_name_titlecase}Models ${CMAKE_SOURCE_DIR}/modules/${module_name}/models )
+add_midas_style_test( Style${module_name_titlecase}Notification ${CMAKE_SOURCE_DIR}/modules/${module_name}/Notification.php )