diff --git a/setup.cfg b/setup.cfg
index eda58d7..c9ba355 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,8 +27,6 @@ setup-hooks =
 [files]
 packages =
     tatuclient
-scripts =
-    bin/tatu
 
 [entry_points]
 tatuclient.versions =
@@ -39,15 +37,15 @@ openstack.cli.extension =
 
 openstack.ssh.v1 =
     usercert_create = tatuclient.v1.cli.usercert:CreateUserCertCommand
-    usercert_list = tatuclient.v1.cli.usercert:ListUserCertsCommand
+    usercert_list = tatuclient.v1.cli.usercert:ListUserCertCommand
     usercert_show = tatuclient.v1.cli.usercert:ShowUserCertCommand
     usercert_revoke = tatuclient.v1.cli.usercert:RevokeUserCertCommand
 
-    hostcert_list = tatuclient.v1.cli.hostcert:ListHostCertsCommand
+    hostcert_list = tatuclient.v1.cli.hostcert:ListHostCertCommand
     hostcert_show = tatuclient.v1.cli.hostcert:ShowHostCertCommand
 
     sshca_create = tatuclient.v1.cli.ca:CreateCACommand
-    sshca_list = tatuclient.v1.cli.ca:ListCAsCommand
+    sshca_list = tatuclient.v1.cli.ca:ListCACommand
     sshca_show = tatuclient.v1.cli.ca:ShowCACommand
 
 [build_sphinx]
diff --git a/tatuclient/v1/client.py b/tatuclient/v1/client.py
index 60921e1..976dfb8 100644
--- a/tatuclient/v1/client.py
+++ b/tatuclient/v1/client.py
@@ -17,8 +17,8 @@ from keystoneauth1 import adapter
 
 from tatuclient import exceptions
 from tatuclient.v1.ca import CAController
-from tatuclient.v1.hostcert import HostCeretController
-from tatuclient.v1.usercert import UserCeretController
+from tatuclient.v1.hostcert import HostCertController
+from tatuclient.v1.usercert import UserCertController
 from tatuclient import version