diff --git a/modules/swagger-codegen-distribution/pom.xml b/modules/swagger-codegen-cli/pom.xml
similarity index 97%
rename from modules/swagger-codegen-distribution/pom.xml
rename to modules/swagger-codegen-cli/pom.xml
index aea6ed3be63..f17c48deee7 100644
--- a/modules/swagger-codegen-distribution/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -8,13 +8,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>swagger-codegen-distribution</artifactId>
+    <artifactId>swagger-codegen-cli</artifactId>
     <packaging>jar</packaging>
 
     <name>swagger-codegen (executable)</name>
 
     <build>
-        <finalName>swagger-cli</finalName>
+        <finalName>swagger-codegen-cli</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/Readme.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/Readme.java
similarity index 100%
rename from modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/Readme.java
rename to modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/Readme.java
diff --git a/modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
similarity index 100%
rename from modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
rename to modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
diff --git a/modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
similarity index 100%
rename from modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
rename to modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
diff --git a/modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java
similarity index 100%
rename from modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java
rename to modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java
diff --git a/modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
similarity index 100%
rename from modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
rename to modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
diff --git a/modules/swagger-codegen-distribution/src/main/resources/logback.xml b/modules/swagger-codegen-cli/src/main/resources/logback.xml
similarity index 100%
rename from modules/swagger-codegen-distribution/src/main/resources/logback.xml
rename to modules/swagger-codegen-cli/src/main/resources/logback.xml
diff --git a/pom.xml b/pom.xml
index 24bd8f8a455..7e8e7b9ddcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,7 +293,7 @@
   </profiles>
   <modules>
     <module>modules/swagger-codegen</module>
-    <module>modules/swagger-codegen-distribution</module>
+    <module>modules/swagger-codegen-cli</module>
     <module>modules/swagger-generator</module>
   </modules>
   <reporting>