diff --git a/src/configuration/cms_setup.e b/src/configuration/cms_setup.e
index 210f63a..b7ceb1d 100644
--- a/src/configuration/cms_setup.e
+++ b/src/configuration/cms_setup.e
@@ -54,7 +54,7 @@ feature -- Access
 feature {CMS_MODULE, CMS_API} -- Restricted access
 
 	update_module_status_within (a_module: CMS_MODULE; a_collection: CMS_MODULE_COLLECTION)
-			-- Is `a_module' enabled, and also its dependencies within the collection `a_collection'?
+			-- Update status of module `a_module', taking into account its dependencies within the collection `a_collection'.
 		require
 			a_module_is_enabled: a_module.is_enabled
 		do
@@ -78,7 +78,7 @@ feature {CMS_MODULE, CMS_API} -- Restricted access
 		end
 
 	update_module_status_from_configuration (m: CMS_MODULE)
-			-- Is module `m' enabled?
+			-- Update status of module `m' according to configuration.
 		local
 			b: BOOLEAN
 			dft: BOOLEAN
diff --git a/src/service/cms_module.e b/src/service/cms_module.e
index 1593999..7b864b8 100644
--- a/src/service/cms_module.e
+++ b/src/service/cms_module.e
@@ -46,7 +46,8 @@ feature {CMS_API} -- Module Initialization
 			is_initialized: is_initialized
 		end
 
-	add_dependency (m: TYPE [CMS_MODULE])
+	add_dependency (a_type: TYPE [CMS_MODULE])
+			-- Add dependency using type of module `a_type'.
 		local
 			deps: like dependencies
 		do
@@ -55,7 +56,7 @@ feature {CMS_API} -- Module Initialization
 				create {ARRAYED_LIST [TYPE [CMS_MODULE]]} deps.make (1)
 				dependencies := deps
 			end
-			deps.force (m)
+			deps.force (a_type)
 		end
 
 feature -- Status