diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000..73f69e095
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/auth0-cli.iml b/.idea/auth0-cli.iml
new file mode 100644
index 000000000..5e764c4f0
--- /dev/null
+++ b/.idea/auth0-cli.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..c6c7795b7
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/auth0-cli.iml" filepath="$PROJECT_DIR$/.idea/auth0-cli.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..94a25f7f4
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/internal/cli/clients.go b/internal/cli/clients.go
index ebeb33227..7a09bb377 100644
--- a/internal/cli/clients.go
+++ b/internal/cli/clients.go
@@ -13,8 +13,8 @@ import (
 
 func clientsCmd(cli *cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "clients",
-		Short: "Manage resources for clients",
+		Use:   "apps",
+		Short: "Manage resources for apps",
 	}
 
 	cmd.SetUsageTemplate(resourceUsageTemplate())
@@ -27,15 +27,15 @@ func clientsCmd(cli *cli) *cobra.Command {
 func clientsListCmd(cli *cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list",
-		Short: "List your existing clients",
+		Short: "List your existing apps",
 		Long: `auth0 client list
-Lists your existing clients. To create one try:
+Lists your existing apps. To create one try:
 
-    auth0 clients create
+    auth0 apps create
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var list *management.ClientList
-			err := ansi.Spinner("Loading clients", func() error {
+			err := ansi.Spinner("Loading apps", func() error {
 				var err error
 				list, err = cli.api.Client.List()
 				return err
@@ -66,7 +66,7 @@ func clientsCreateCmd(cli *cli) *cobra.Command {
 		Short: "Create a new client (also know as application)",
 		Long: `Create a new client (or application):
 
-auth0 clients create --name myapp --type [native|spa|regular|m2m]
+auth0 apps create --name myapp --type [native|spa|regular|m2m]
 
 - supported application type:
 	`,