diff --git a/scala-extensions/pom.xml b/scala-extensions/pom.xml
index 4ff2d18ad..3e58b884f 100644
--- a/scala-extensions/pom.xml
+++ b/scala-extensions/pom.xml
@@ -12,10 +12,10 @@
   <description>Scala extensions parent module</description>
 
   <modules>
-    <module>scala-extensions-2.10</module>
-    <module>scala-extensions-2.11</module>
-    <module>scala-extensions-2.12</module>
-    <module>scala-extensions-2.13</module>
+    <module>scala-extensions_2.10</module>
+    <module>scala-extensions_2.11</module>
+    <module>scala-extensions_2.12</module>
+    <module>scala-extensions_2.13</module>
   </modules>
   <packaging>pom</packaging>
 </project>
diff --git a/scala-extensions/scala-extensions-2.10/build.sbt b/scala-extensions/scala-extensions_2.10/build.sbt
similarity index 87%
rename from scala-extensions/scala-extensions-2.10/build.sbt
rename to scala-extensions/scala-extensions_2.10/build.sbt
index f662c4b31..04a316d88 100644
--- a/scala-extensions/scala-extensions-2.10/build.sbt
+++ b/scala-extensions/scala-extensions_2.10/build.sbt
@@ -1,4 +1,4 @@
-lazy val `scala-extensions-2-10` = project
+lazy val `scala-extensions_2-10` = project
   .in(file("."))
   .settings(
     resolvers += Resolver.mavenLocal,
diff --git a/scala-extensions/scala-extensions-2.10/pom.xml b/scala-extensions/scala-extensions_2.10/pom.xml
similarity index 97%
rename from scala-extensions/scala-extensions-2.10/pom.xml
rename to scala-extensions/scala-extensions_2.10/pom.xml
index f95043fb0..6f06660d4 100644
--- a/scala-extensions/scala-extensions-2.10/pom.xml
+++ b/scala-extensions/scala-extensions_2.10/pom.xml
@@ -6,10 +6,10 @@
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>scala-extensions-2.10</artifactId>
+  <artifactId>scala-extensions_2.10</artifactId>
   <packaging>jar</packaging>
 
-  <name>scala-extensions-2.10</name>
+  <name>scala-extensions_2.10</name>
   <description>Scala extensions for mustache.java</description>
   <url>http://github.com/spullara/mustache.java</url>
 
diff --git a/scala-extensions/scala-extensions-2.10/src/main/java/com/twitter/mustache/Javadoc.java b/scala-extensions/scala-extensions_2.10/src/main/java/com/twitter/mustache/Javadoc.java
similarity index 100%
rename from scala-extensions/scala-extensions-2.10/src/main/java/com/twitter/mustache/Javadoc.java
rename to scala-extensions/scala-extensions_2.10/src/main/java/com/twitter/mustache/Javadoc.java
diff --git a/scala-extensions/scala-extensions-2.10/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala b/scala-extensions/scala-extensions_2.10/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.10/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
rename to scala-extensions/scala-extensions_2.10/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
diff --git a/scala-extensions/scala-extensions-2.10/src/main/scala/com/twitter/mustache/TwitterObjectHandler.scala b/scala-extensions/scala-extensions_2.10/src/main/scala/com/twitter/mustache/TwitterObjectHandler.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.10/src/main/scala/com/twitter/mustache/TwitterObjectHandler.scala
rename to scala-extensions/scala-extensions_2.10/src/main/scala/com/twitter/mustache/TwitterObjectHandler.scala
diff --git a/scala-extensions/scala-extensions-2.10/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala b/scala-extensions/scala-extensions_2.10/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.10/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
rename to scala-extensions/scala-extensions_2.10/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
diff --git a/scala-extensions/scala-extensions-2.11/build.sbt b/scala-extensions/scala-extensions_2.11/build.sbt
similarity index 85%
rename from scala-extensions/scala-extensions-2.11/build.sbt
rename to scala-extensions/scala-extensions_2.11/build.sbt
index 616dc9da6..05996e4ae 100644
--- a/scala-extensions/scala-extensions-2.11/build.sbt
+++ b/scala-extensions/scala-extensions_2.11/build.sbt
@@ -1,4 +1,4 @@
-lazy val `scala-extensions-2-11` = project
+lazy val `scala-extensions_2-11` = project
   .in(file("."))
   .settings(
     resolvers += Resolver.mavenLocal,
diff --git a/scala-extensions/scala-extensions-2.11/pom.xml b/scala-extensions/scala-extensions_2.11/pom.xml
similarity index 97%
rename from scala-extensions/scala-extensions-2.11/pom.xml
rename to scala-extensions/scala-extensions_2.11/pom.xml
index 56af911bc..4dc60c928 100644
--- a/scala-extensions/scala-extensions-2.11/pom.xml
+++ b/scala-extensions/scala-extensions_2.11/pom.xml
@@ -6,10 +6,10 @@
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>scala-extensions-2.11</artifactId>
+  <artifactId>scala-extensions_2.11</artifactId>
   <packaging>jar</packaging>
 
-  <name>scala-extensions-2.11</name>
+  <name>scala-extensions_2.11</name>
   <description>Scala extensions for mustache.java</description>
   <url>http://github.com/spullara/mustache.java</url>
 
diff --git a/scala-extensions/scala-extensions-2.11/src/main/java/com/twitter/mustache/Javadoc.java b/scala-extensions/scala-extensions_2.11/src/main/java/com/twitter/mustache/Javadoc.java
similarity index 100%
rename from scala-extensions/scala-extensions-2.11/src/main/java/com/twitter/mustache/Javadoc.java
rename to scala-extensions/scala-extensions_2.11/src/main/java/com/twitter/mustache/Javadoc.java
diff --git a/scala-extensions/scala-extensions-2.11/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala b/scala-extensions/scala-extensions_2.11/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.11/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
rename to scala-extensions/scala-extensions_2.11/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
diff --git a/scala-extensions/scala-extensions-2.11/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala b/scala-extensions/scala-extensions_2.11/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.11/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
rename to scala-extensions/scala-extensions_2.11/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
diff --git a/scala-extensions/scala-extensions-2.12/build.sbt b/scala-extensions/scala-extensions_2.12/build.sbt
similarity index 85%
rename from scala-extensions/scala-extensions-2.12/build.sbt
rename to scala-extensions/scala-extensions_2.12/build.sbt
index bb817fedd..321300944 100644
--- a/scala-extensions/scala-extensions-2.12/build.sbt
+++ b/scala-extensions/scala-extensions_2.12/build.sbt
@@ -1,4 +1,4 @@
-lazy val `scala-extensions-2-12` = project
+lazy val `scala-extensions_2-12` = project
   .in(file("."))
   .settings(
     resolvers += Resolver.mavenLocal,
diff --git a/scala-extensions/scala-extensions-2.12/pom.xml b/scala-extensions/scala-extensions_2.12/pom.xml
similarity index 97%
rename from scala-extensions/scala-extensions-2.12/pom.xml
rename to scala-extensions/scala-extensions_2.12/pom.xml
index 3b2a974fe..827bc2324 100644
--- a/scala-extensions/scala-extensions-2.12/pom.xml
+++ b/scala-extensions/scala-extensions_2.12/pom.xml
@@ -6,10 +6,10 @@
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>scala-extensions-2.12</artifactId>
+  <artifactId>scala-extensions_2.12</artifactId>
   <packaging>jar</packaging>
 
-  <name>scala-extensions-2.12</name>
+  <name>scala-extensions_2.12</name>
   <description>Scala extensions for mustache.java</description>
   <url>http://github.com/spullara/mustache.java</url>
 
diff --git a/scala-extensions/scala-extensions-2.12/src/main/java/com/twitter/mustache/Javadoc.java b/scala-extensions/scala-extensions_2.12/src/main/java/com/twitter/mustache/Javadoc.java
similarity index 100%
rename from scala-extensions/scala-extensions-2.12/src/main/java/com/twitter/mustache/Javadoc.java
rename to scala-extensions/scala-extensions_2.12/src/main/java/com/twitter/mustache/Javadoc.java
diff --git a/scala-extensions/scala-extensions-2.12/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala b/scala-extensions/scala-extensions_2.12/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.12/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
rename to scala-extensions/scala-extensions_2.12/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
diff --git a/scala-extensions/scala-extensions-2.12/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala b/scala-extensions/scala-extensions_2.12/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.12/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
rename to scala-extensions/scala-extensions_2.12/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
diff --git a/scala-extensions/scala-extensions-2.13/build.sbt b/scala-extensions/scala-extensions_2.13/build.sbt
similarity index 85%
rename from scala-extensions/scala-extensions-2.13/build.sbt
rename to scala-extensions/scala-extensions_2.13/build.sbt
index fb98ecefd..d11ef7b6a 100644
--- a/scala-extensions/scala-extensions-2.13/build.sbt
+++ b/scala-extensions/scala-extensions_2.13/build.sbt
@@ -1,4 +1,4 @@
-lazy val `scala-extensions-2-13` = project
+lazy val `scala-extensions_2-13` = project
   .in(file("."))
   .settings(
     resolvers += Resolver.mavenLocal,
diff --git a/scala-extensions/scala-extensions-2.13/pom.xml b/scala-extensions/scala-extensions_2.13/pom.xml
similarity index 97%
rename from scala-extensions/scala-extensions-2.13/pom.xml
rename to scala-extensions/scala-extensions_2.13/pom.xml
index 48479c71a..8a68d23e5 100644
--- a/scala-extensions/scala-extensions-2.13/pom.xml
+++ b/scala-extensions/scala-extensions_2.13/pom.xml
@@ -6,10 +6,10 @@
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>scala-extensions-2.13</artifactId>
+  <artifactId>scala-extensions_2.13</artifactId>
   <packaging>jar</packaging>
 
-  <name>scala-extensions-2.13</name>
+  <name>scala-extensions_2.13</name>
   <description>Scala extensions for mustache.java</description>
   <url>http://github.com/spullara/mustache.java</url>
 
diff --git a/scala-extensions/scala-extensions-2.13/src/main/java/com/twitter/mustache/Javadoc.java b/scala-extensions/scala-extensions_2.13/src/main/java/com/twitter/mustache/Javadoc.java
similarity index 100%
rename from scala-extensions/scala-extensions-2.13/src/main/java/com/twitter/mustache/Javadoc.java
rename to scala-extensions/scala-extensions_2.13/src/main/java/com/twitter/mustache/Javadoc.java
diff --git a/scala-extensions/scala-extensions-2.13/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala b/scala-extensions/scala-extensions_2.13/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.13/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
rename to scala-extensions/scala-extensions_2.13/src/main/scala/com/twitter/mustache/ScalaObjectHandler.scala
diff --git a/scala-extensions/scala-extensions-2.13/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala b/scala-extensions/scala-extensions_2.13/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
similarity index 100%
rename from scala-extensions/scala-extensions-2.13/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
rename to scala-extensions/scala-extensions_2.13/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala