diff --git a/solumclient/builder/v1/image.py b/solumclient/builder/v1/image.py
index c64f90b..0eb6d71 100644
--- a/solumclient/builder/v1/image.py
+++ b/solumclient/builder/v1/image.py
@@ -14,7 +14,6 @@
 
 from solumclient.common import base as solum_base
 from solumclient.openstack.common.apiclient import base as apiclient_base
-from solumclient.openstack.common import uuidutils
 
 
 class Image(apiclient_base.Resource):
@@ -37,13 +36,6 @@ class ImageManager(solum_base.CrudManager, solum_base.FindMixin):
         return super(ImageManager, self).list(base_url="/v1", **kwargs)
 
     def find(self, **kwargs):
-        if 'lp_uuid' in kwargs:
-            return super(ImageManager, self).get(base_url="/v1", **kwargs)
-        elif 'name_or_id' in kwargs:
-            name_or_uuid = kwargs['name_or_id']
-            if uuidutils.is_uuid_like(name_or_uuid):
-                return super(ImageManager, self).get(
-                    base_url="/v1",
-                    lp_uuid=name_or_uuid)
-            else:
-                return super(ImageManager, self).findone(name=name_or_uuid)
+        name_or_uuid = kwargs['name_or_id']
+        return super(ImageManager, self).get(base_url="/v1",
+                                             image_id=name_or_uuid)
diff --git a/solumclient/solum.py b/solumclient/solum.py
index c9d39e5..068f84d 100644
--- a/solumclient/solum.py
+++ b/solumclient/solum.py
@@ -450,11 +450,11 @@ Available commands:
 
     def show(self):
         """Get a language pack."""
-        self.parser.add_argument('lp_uuid',
+        self.parser.add_argument('lp_id',
                                  help="Language pack id")
-        self.parser._names['lp_uuid'] = 'languagepack'
+        self.parser._names['lp_id'] = 'languagepack'
         args, _ = self.parser.parse_known_args()
-        response = self.bldclient.images.find(lp_uuid=args.lp_uuid)
+        response = self.bldclient.images.find(name_or_id=args.lp_id)
         fields = ['uuid', 'name', 'description', 'state', 'source_uri']
         data = dict([(f, getattr(response, f, ''))
                      for f in fields])
diff --git a/solumclient/tests/test_solum.py b/solumclient/tests/test_solum.py
index e189ebb..dd21791 100644
--- a/solumclient/tests/test_solum.py
+++ b/solumclient/tests/test_solum.py
@@ -391,7 +391,7 @@ class TestSolum(base.TestCase):
     def test_languagepack_get(self, mock_lp_get):
         self.make_env()
         self.shell("languagepack show fake-lp-id1")
-        mock_lp_get.assert_called_once_with(lp_uuid='fake-lp-id1')
+        mock_lp_get.assert_called_once_with(name_or_id='fake-lp-id1')
 
     # Component Tests #
     @mock.patch.object(component.ComponentManager, "list")