Index: /trunk/modules/vci_cc_xcache_wrapper_v1/caba/metadata/vci_cc_xcache_wrapper_v1.sd
===================================================================
--- /trunk/modules/vci_cc_xcache_wrapper_v1/caba/metadata/vci_cc_xcache_wrapper_v1.sd	(revision 25)
+++ /trunk/modules/vci_cc_xcache_wrapper_v1/caba/metadata/vci_cc_xcache_wrapper_v1.sd	(revision 26)
@@ -34,6 +34,6 @@
 	instance_parameters = [
 		parameter.Int('proc_id'),
-		parameter.Module('mtp', 'common:mapping_table'),
-		parameter.Module('mtc', 'common:mapping_table'),
+		parameter.Module('mtp'),
+		parameter.Module('mtc'),
 		parameter.IntTab('initiator_rw_index'),
 		parameter.IntTab('initiator_c_index'),
@@ -48,10 +48,10 @@
 	   extensions = [
 	'dsx:get_ident='
-        'initiator_rw_index:p_vci_ini_rw:mt,'
-        'initiator_c_index:p_vci_ini_c:mc,'
-        'target_index:p_vci_tgt:mc',
+        'initiator_rw_index:p_vci_ini_rw:mtp,'
+        'initiator_c_index:p_vci_ini_c:mtc,'
+        'target_index:p_vci_tgt:mtc',
 	'dsx:cpu=wrapper:iss_t',
 	'dsx:addressable=target_index',
-    'dsx:on_segment=mc:add_index:initiator_rw_index',
+        'dsx:on_segment=mc:add_index:initiator_rw_index',
 	'dsx:mapping_type=processor:proc_id',
    ],
Index: /trunk/modules/vci_mem_cache_v1/caba/metadata/vci_mem_cache_v1.sd
===================================================================
--- /trunk/modules/vci_mem_cache_v1/caba/metadata/vci_mem_cache_v1.sd	(revision 25)
+++ /trunk/modules/vci_mem_cache_v1/caba/metadata/vci_mem_cache_v1.sd	(revision 26)
@@ -26,7 +26,7 @@
                 Port('caba:clock_in', 'p_clk', auto = 'clock'),],
        instance_parameters = [
-		parameter.Module('mtp', 'common:mapping_table'),
-		parameter.Module('mtc', 'common:mapping_table'),
-		parameter.Module('mtx', 'common:mapping_table'),
+		parameter.Module('mtp'),
+		parameter.Module('mtc'),
+		parameter.Module('mtx'),
 		parameter.IntTab('vci_ixr_index'),
 		parameter.IntTab('vci_ini_index'),
@@ -43,5 +43,5 @@
           'vci_tgt_index:p_vci_tgt:mtp,'
           'vci_ixr_index:p_vci_ixr:mtx',
-		'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
+          'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
        ],
 )