diff --git a/config/cml/container_ruleset.template b/config/cml/container_ruleset.template
index 4da1e1f..abf99e5 100644
--- a/config/cml/container_ruleset.template
+++ b/config/cml/container_ruleset.template
@@ -203,16 +203,15 @@ menu cont%(cn)d_physmem_list
 
 # Options for custom capabilities
 symbols
-cont%(cn)d_cap0_rtype			'Capability Target Resource Type'
 cont%(cn)d_cap0_type			'Capability Operation Type'
 
 CONT%(cn)d_CAP0_IPC_TYPE		'IPC Capability'
 CONT%(cn)d_CAP0_TCTRL_TYPE		'Thread Control Capability'
 
-CONT%(cn)d_CAP0_TARGET_CURRENT_CONT	'Targets Current Container'
-CONT%(cn)d_CAP0_TARGET_ANOTHER_CONT	'Targets Another Container'
-CONT%(cn)d_CAP0_TARGET_CURRENT_PAGER_SPACE 'Targets Current Pager`s Space'
-CONT%(cn)d_CAP0_TARGET_ANOTHER_PAGER	'Targets Another Pager'
+CONT%(cn)d_CAP0_TARGET_CURRENT_CONT	'Capability Targets Current Container'
+CONT%(cn)d_CAP0_TARGET_ANOTHER_CONT	'Capability Targets Another Container'
+CONT%(cn)d_CAP0_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
+CONT%(cn)d_CAP0_TARGET_ANOTHER_PAGER	'Capability Targets Another Container`s Pager'
 CONT%(cn)d_CAP0_TARGET			'Enter Container ID'
 
 choices cont%(cn)d_cap0_type
@@ -222,27 +221,25 @@ choices cont%(cn)d_cap0_type
 
 menu cont%(cn)d_capability0
 	cont%(cn)d_cap0_type
-	cont%(cn)d_cap0_rtype
-	CONT%(cn)d_CAP0_TARGET%
-
-choices cont%(cn)d_cap0_rtype
+	CONT%(cn)d_CAP0_TARGET_CURRENT_PAGER_SPACE
 	CONT%(cn)d_CAP0_TARGET_CURRENT_CONT
 	CONT%(cn)d_CAP0_TARGET_ANOTHER_CONT
-	CONT%(cn)d_CAP0_TARGET_CURRENT_PAGER_SPACE
 	CONT%(cn)d_CAP0_TARGET_ANOTHER_PAGER
-	default CONT%(cn)d_CAP0_TARGET_CURRENT_CONT
+	CONT%(cn)d_CAP0_TARGET%
+
+choicegroup CONT%(cn)d_CAP0_TARGET_CURRENT_CONT CONT%(cn)d_CAP0_TARGET_ANOTHER_CONT CONT%(cn)d_CAP0_TARGET_CURRENT_PAGER_SPACE CONT%(cn)d_CAP0_TARGET_ANOTHER_PAGER default CONT%(cn)d_CAP0_TARGET_CURRENT_CONT from y
 
 when CONT%(cn)d_CAP0_TARGET_CURRENT_CONT == y suppress CONT%(cn)d_CAP0_TARGET
 when CONT%(cn)d_CAP0_TARGET_CURRENT_PAGER_SPACE == y suppress CONT%(cn)d_CAP0_TARGET
 
-when cont%(cn)d_cap0_type != CONT%(cn)d_CAP0_IPC_TYPE suppress CONT%(cn)d_CAP0_TARGET_ANOTHER_CONT CONT%(cn)d_CAP0_TARGET_ANOTHER_PAGER
+when CONT%(cn)d_CAP0_IPC_TYPE == n suppress CONT%(cn)d_CAP0_TARGET_ANOTHER_CONT CONT%(cn)d_CAP0_TARGET_ANOTHER_PAGER
 
 symbols
 CONT%(cn)d_THREADPOOL_SIZE	'Number of Threads'
 CONT%(cn)d_SPACEPOOL_SIZE	'Number of Address Spaces'
 CONT%(cn)d_MAPPOOL_SIZE		'Number of PMD Mappings (E.g. Middle-level Page Tables)'
 CONT%(cn)d_MUTEXPOOL_SIZE	'Number of Userspace Mutexes'
-CONT%(cn)d_CAPPOOL_SIZE		'Number of Capabilities (Created via Split, Replicate)'
+CONT%(cn)d_CAPPOOL_SIZE		'Number of Capabilities (Created at run-time via Split, Replicate)'
 
 cont%(cn)d_cap_threadpool	'Container %(cn)d Thread Pool Capability'
 cont%(cn)d_cap_spacepool	'Container %(cn)d Space Pool Capability'