diff --git a/examples/demo/src/ewf_roc_server.e b/examples/demo/src/ewf_roc_server.e
index 51e5462..b442299 100644
--- a/examples/demo/src/ewf_roc_server.e
+++ b/examples/demo/src/ewf_roc_server.e
@@ -135,11 +135,11 @@ feature -- CMS setup
 		do
 			create {BASIC_AUTH_MODULE} m.make
 			m.enable
-			a_setup.modules.extend (m)
+			a_setup.available_modules.extend (m)
 
 			create {CMS_DEMO_MODULE} m.make
 			m.enable
-			a_setup.modules.extend (m)
+			a_setup.available_modules.extend (m)
 		end
 
 	setup_storage (a_setup: CMS_SETUP)
diff --git a/library/src/configuration/cms_default_setup.e b/library/src/configuration/cms_default_setup.e
index c5c3c85..2ba87ba 100644
--- a/library/src/configuration/cms_default_setup.e
+++ b/library/src/configuration/cms_default_setup.e
@@ -27,7 +27,7 @@ feature {NONE} -- Initialization
 			-- Initialize varius cms components.
 		do
 			configure
-			create modules.make (3)
+			create available_modules.make (3)
 			build_mailer
 			initialize_modules
 		end
@@ -65,12 +65,12 @@ feature {NONE} -- Initialization
 
 			create {NODE_MODULE} m.make (Current)
 			m.enable
-			modules.extend (m)
+			available_modules.extend (m)
 		end
 
 feature -- Access
 
-	modules: CMS_MODULE_COLLECTION
+	available_modules: CMS_MODULE_COLLECTION
 			-- <Precursor>
 
 	is_html: BOOLEAN
diff --git a/library/src/configuration/cms_setup.e b/library/src/configuration/cms_setup.e
index 68136c5..64ffe00 100644
--- a/library/src/configuration/cms_setup.e
+++ b/library/src/configuration/cms_setup.e
@@ -24,19 +24,19 @@ feature -- Access
 		deferred
 		end
 
-	modules: CMS_MODULE_COLLECTION
+	available_modules: CMS_MODULE_COLLECTION
 			-- List of available modules.
 		deferred
 		end
 
-	modules_enabled: CMS_MODULE_COLLECTION
+	enabled_modules: CMS_MODULE_COLLECTION
 			-- List of enabled modules.
 		local
 			l_module: CMS_MODULE
 		do
-			create Result.make (modules.count)
+			create Result.make (available_modules.count)
 			across
-				modules as ic
+				available_modules as ic
 			loop
 				l_module := ic.item
 				if l_module.is_enabled then
diff --git a/library/src/service/cms_service.e b/library/src/service/cms_service.e
index f1e4a2e..4a339fe 100644
--- a/library/src/service/cms_service.e
+++ b/library/src/service/cms_service.e
@@ -65,7 +65,7 @@ feature {NONE} -- Initialization
 	initialize_modules
 			-- Intialize modules and keep only enabled modules.
 		do
-			modules := setup.modules_enabled
+			modules := setup.enabled_modules
 		ensure
 			only_enabled_modules: across modules as ic all ic.item.is_enabled end
 		end
diff --git a/library/src/service/response/cms_response.e b/library/src/service/response/cms_response.e
index 7cc43f2..61ffc84 100644
--- a/library/src/service/response/cms_response.e
+++ b/library/src/service/response/cms_response.e
@@ -36,19 +36,17 @@ feature {NONE} -- Initialization
 	register_hooks
 		local
 			l_module: CMS_MODULE
-			l_available_modules: CMS_MODULE_COLLECTION
+			l_enabled_modules: CMS_MODULE_COLLECTION
 		do
-			l_available_modules := setup.modules
+			l_enabled_modules := setup.enabled_modules
 			across
-				l_available_modules as ic
+				l_enabled_modules as ic
 			loop
 				l_module := ic.item
-				if l_module.is_enabled then
-					if attached {CMS_HOOK_AUTO_REGISTER} l_module as l_auto then
-						l_auto.auto_subscribe_to_hooks (Current)
-					end
-					l_module.register_hooks (Current)
+				if attached {CMS_HOOK_AUTO_REGISTER} l_module as l_auto then
+					l_auto.auto_subscribe_to_hooks (Current)
 				end
+				l_module.register_hooks (Current)
 			end
 		end