diff --git a/‎gitlab/cli.py‎
Lines changed: 17 additions & 4 deletions b/‎gitlab/cli.py‎
Lines changed: 17 additions & 4 deletions
diff --git a/‎gitlab/tests/test_cli.py‎
Lines changed: 28 additions & 14 deletions b/‎gitlab/tests/test_cli.py‎
Lines changed: 28 additions & 14 deletions
diff --git a/‎gitlab/v4/cli.py‎
Lines changed: 2 additions & 2 deletions b/‎gitlab/v4/cli.py‎
Lines changed: 2 additions & 2 deletions
@@ -23,9 +23,14 @@
 import re
 import sys
 
+from requests.structures import CaseInsensitiveDict
+
 import gitlab.config
 
-camel_re = re.compile("(.)([A-Z])")
+# Full credit for this regex goes to:
+# https://github.com/jpvanhal/inflection/blob/master/inflection/__init__.py
+camel_upperlower_regex = re.compile(r"([A-Z]+)([A-Z][a-z])")
+camel_lowerupper_regex = re.compile(r"([a-z\d])([A-Z])")
 
 # custom_actions = {
 #    cls: {
@@ -70,12 +75,20 @@ def die(msg, e=None):
     sys.exit(1)
 
 
-def what_to_cls(what):
-    return "".join([s.capitalize() for s in what.split("-")])
+def what_to_cls(object, what):
+    """Convert a kebab-case argument to the corresponding attribute of an object
+    with a case-insensitive lookup."""
+    attributes = CaseInsensitiveDict(object.__dict__)
+    lowercase_attribute = what.replace("-", "")
+
+    return attributes[lowercase_attribute]
 
 
 def cls_to_what(cls):
-    return camel_re.sub(r"\1-\2", cls.__name__).lower()
+    """Convert CamelCase class names to kebab-case in two steps, to ensure names
+    with whole upper-case words are correctly dash-separated as well."""
+    dash_upper = camel_upperlower_regex.sub(r"\1-\2", cls.__name__)
+    return camel_lowerupper_regex.sub(r"\1-\2", dash_upper).lower()
 
 
 def _get_base_parser(add_help=True):
 
@@ -29,20 +29,34 @@
 import gitlab.v4.cli
 
 
-def test_what_to_cls():
-    assert "Foo" == cli.what_to_cls("foo")
-    assert "FooBar" == cli.what_to_cls("foo-bar")
-
-
-def test_cls_to_what():
-    class Class(object):
-        pass
-
-    class TestClass(object):
-        pass
-
-    assert "test-class" == cli.cls_to_what(TestClass)
-    assert "class" == cli.cls_to_what(Class)
+@pytest.mark.parametrize(
+    "what,attribute_class",
+    [
+        ("class", "Class"),
+        ("test-class", "TestClass"),
+        ("test-longer-class", "TestLongerClass"),
+    ],
+)
+def test_what_to_cls(what, attribute_class):
+    AttributeClass = type(attribute_class, (), {})
+    GitlabCLI = type("GitlabCLI", (), {attribute_class: AttributeClass})
+
+    assert cli.what_to_cls(GitlabCLI, what) == AttributeClass
+
+
+@pytest.mark.parametrize(
+    "class_name,expected_what",
+    [
+        ("Class", "class"),
+        ("TestClass", "test-class"),
+        ("TestUPPERCASEClass", "test-uppercase-class"),
+        ("UPPERCASETestClass", "uppercase-test-class"),
+    ],
+)
+def test_cls_to_what(class_name, expected_what):
+    TestClass = type(class_name, (), {})
+
+    assert cli.cls_to_what(TestClass) == expected_what
 
 
 def test_die():
 
@@ -28,8 +28,8 @@
 
 class GitlabCLI(object):
     def __init__(self, gl, what, action, args):
-        self.cls_name = cli.what_to_cls(what)
-        self.cls = gitlab.v4.objects.__dict__[self.cls_name]
+        self.cls = cli.what_to_cls(self, what)
+        self.cls_name = self.cls.__name__
         self.what = what.replace("-", "_")
         self.action = action.lower()
         self.gl = gl