diff --git a/pom.xml b/pom.xml
index c5ac800c..04f1e3fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,10 +8,10 @@
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
-		<module>spring-amqp-core</module>
 		<module>spring-amqp-parent</module>
-		<module>spring-otp</module>
+		<module>spring-amqp-core</module>
 		<module>spring-rabbit</module>
+		<module>spring-erlang</module>
 		<module>spring-rabbit-admin</module>
 	</modules>
 	<properties>
diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index 3e677090..fd7ed61b 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -96,7 +96,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.amqp</groupId>
-				<artifactId>spring-otp</artifactId>
+				<artifactId>spring-erlang</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
diff --git a/spring-otp/.classpath b/spring-erlang/.classpath
similarity index 100%
rename from spring-otp/.classpath
rename to spring-erlang/.classpath
diff --git a/spring-otp/.gitignore b/spring-erlang/.gitignore
similarity index 100%
rename from spring-otp/.gitignore
rename to spring-erlang/.gitignore
diff --git a/spring-otp/.project b/spring-erlang/.project
similarity index 97%
rename from spring-otp/.project
rename to spring-erlang/.project
index 01f3e555..a3a7d107 100644
--- a/spring-otp/.project
+++ b/spring-erlang/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-otp</name>
+	<name>spring-erlang</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-otp/.settings/org.eclipse.jdt.core.prefs b/spring-erlang/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-otp/.settings/org.eclipse.jdt.core.prefs
rename to spring-erlang/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-otp/.settings/org.maven.ide.eclipse.prefs b/spring-erlang/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from spring-otp/.settings/org.maven.ide.eclipse.prefs
rename to spring-erlang/.settings/org.maven.ide.eclipse.prefs
diff --git a/spring-otp/.springBeans b/spring-erlang/.springBeans
similarity index 100%
rename from spring-otp/.springBeans
rename to spring-erlang/.springBeans
diff --git a/spring-otp/pom.xml b/spring-erlang/pom.xml
similarity index 97%
rename from spring-otp/pom.xml
rename to spring-erlang/pom.xml
index 274fc378..d5e71e6b 100644
--- a/spring-otp/pom.xml
+++ b/spring-erlang/pom.xml
@@ -7,9 +7,9 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-amqp-parent/pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-otp</artifactId>
+	<artifactId>spring-erlang</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring OTP Support</name>
+	<name>Spring Erlang Support</name>
 	<dependencies>
 
 		<!--  Spring -->
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/OtpAuthException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpAuthException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/OtpAuthException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/OtpAuthException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/OtpException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/OtpException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/OtpException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/OtpIOException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpIOException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/OtpIOException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/OtpIOException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/core/Application.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/core/Application.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/core/Application.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/core/Application.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/core/Node.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/core/Node.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/core/Node.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/core/Node.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java
diff --git a/spring-otp/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java b/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java
rename to spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/Background.java b/spring-erlang/src/main/java/org/springframework/util/exec/Background.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/Background.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/Background.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/Escape.java b/spring-erlang/src/main/java/org/springframework/util/exec/Escape.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/Escape.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/Escape.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/Execute.java b/spring-erlang/src/main/java/org/springframework/util/exec/Execute.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/Execute.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/Execute.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/ExecuteStreamHandler.java b/spring-erlang/src/main/java/org/springframework/util/exec/ExecuteStreamHandler.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/ExecuteStreamHandler.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/ExecuteStreamHandler.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/ExecuteWatchdog.java b/spring-erlang/src/main/java/org/springframework/util/exec/ExecuteWatchdog.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/ExecuteWatchdog.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/ExecuteWatchdog.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/Os.java b/spring-erlang/src/main/java/org/springframework/util/exec/Os.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/Os.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/Os.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/PumpStreamHandler.java b/spring-erlang/src/main/java/org/springframework/util/exec/PumpStreamHandler.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/PumpStreamHandler.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/PumpStreamHandler.java
diff --git a/spring-otp/src/main/java/org/springframework/util/exec/StreamPumper.java b/spring-erlang/src/main/java/org/springframework/util/exec/StreamPumper.java
similarity index 100%
rename from spring-otp/src/main/java/org/springframework/util/exec/StreamPumper.java
rename to spring-erlang/src/main/java/org/springframework/util/exec/StreamPumper.java
diff --git a/spring-otp/template.mf b/spring-erlang/template.mf
similarity index 100%
rename from spring-otp/template.mf
rename to spring-erlang/template.mf
diff --git a/spring-rabbit-admin/pom.xml b/spring-rabbit-admin/pom.xml
index 2a8f8771..a57973fb 100644
--- a/spring-rabbit-admin/pom.xml
+++ b/spring-rabbit-admin/pom.xml
@@ -21,7 +21,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-otp</artifactId>
+			<artifactId>spring-erlang</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index ea675d36..6646531e 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -52,7 +52,7 @@
 			<!-- adds module jars to the distribution archive under the 'dist' directory -->
 			<includes>
 				<include>org.springframework.amqp:spring-amqp-core</include>
-				<include>org.springframework.amqp:spring-otp</include>
+				<include>org.springframework.amqp:spring-erlang</include>
 				<include>org.springframework.amqp:spring-rabbit</include>
 				<include>org.springframework.amqp:spring-rabbit-admin</include>
 			</includes>
@@ -67,7 +67,7 @@
 			     see pom.xml 'maven-source-plugin' declaration -->
 			<includes>
 				<include>org.springframework.amqp:spring-amqp-core</include>
-				<include>org.springframework.amqp:spring-otp</include>
+				<include>org.springframework.amqp:spring-erlang</include>
 				<include>org.springframework.amqp:spring-rabbit</include>
 				<include>org.springframework.amqp:spring-rabbit-admin</include>
 			</includes>