diff --git a/magnumclient/api/containers.py b/magnumclient/api/containers.py
index 5ea926fa..c369e2f0 100644
--- a/magnumclient/api/containers.py
+++ b/magnumclient/api/containers.py
@@ -73,11 +73,11 @@ class ContainerManager(base.Manager):
         if limit is None:
             # TODO(yuanying): if endpoint returns "map",
             # change None to response_key
-            return self._list(self._path(path), None)
+            return self._list(self._path(path), "containers")
         else:
             # TODO(yuanying): if endpoint returns "map",
             # change None to response_key
-            return self._list_pagination(self._path(path), None,
+            return self._list_pagination(self._path(path), "containers",
                                          limit=limit)
 
     def get(self, id):
diff --git a/magnumclient/api/shell.py b/magnumclient/api/shell.py
index b84f0ef2..da0c9710 100644
--- a/magnumclient/api/shell.py
+++ b/magnumclient/api/shell.py
@@ -265,7 +265,7 @@ def do_container_create(cs, args):
 def do_container_list(cs, args):
     """Print a list of available containers."""
     containers = cs.containers.list()
-    columns = ('container_id', 'name', 'desc')
+    columns = ('uuid', 'name', 'desc')
     utils.print_list(containers, columns,
                      {'versions': _print_list_field('versions')})