diff --git a/vitrageclient/v1/cli/alarm.py b/vitrageclient/v1/cli/alarm.py
index 87547c5..07ad2d5 100644
--- a/vitrageclient/v1/cli/alarm.py
+++ b/vitrageclient/v1/cli/alarm.py
@@ -42,10 +42,10 @@ class AlarmList(lister.Lister):
         alarms = utils.get_client(self).alarm.list(vitrage_id=vitrage_id,
                                                    all_tenants=all_tenants)
         return utils.list2cols(('vitrage_id',
-                                'type',
+                                'vitrage_type',
                                 'name',
-                                'resource_type',
-                                'resource_id',
-                                'aggregated_severity',
-                                'operational_severity',
+                                'vitrage_resource_type',
+                                'vitrage_resource_id',
+                                'vitrage_aggregated_severity',
+                                'vitrage_operational_severity',
                                 'update_timestamp'), alarms)
diff --git a/vitrageclient/v1/cli/resource.py b/vitrageclient/v1/cli/resource.py
index de0bc0a..09bace4 100644
--- a/vitrageclient/v1/cli/resource.py
+++ b/vitrageclient/v1/cli/resource.py
@@ -35,8 +35,8 @@ class ResourceList(lister.Lister):
     """List resources"""
 
     RESOURCE_PROPERTIES = \
-        ('vitrage_id', 'type', 'id', 'state',
-         'aggregated_state', 'metadata')
+        ('vitrage_id', 'vitrage_type', 'id', 'state',
+         'vitrage_aggregated_state', 'metadata')
     METADATA = ('name', 'project_id', 'update_timestamp')
 
     def get_parser(self, prog_name):