diff --git a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
similarity index 89%
rename from maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
rename to maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
index f6e70c9..d456a44 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.objectteams</groupId>
-  <artifactId>objectteams-runtime</artifactId>
-  <version>2.1.2</version>
-  <description>The OT/J Runtime Library</description>
+  <artifactId>objectteams-otre</artifactId>
+  <version>2.3.0</version>
+  <description>The Object Teams Runtime Environment (OTRE)</description>
 
   <licenses>
 	<license>
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index bbe1517..eeb3f8c 100644
--- a/maven/infrastructure/artifact-deployer/pom.xml
+++ b/maven/infrastructure/artifact-deployer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.2.0</version>
+		<version>2.3.0</version>
 		<relativePath>../parent-pom</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 			<comments>
 				This file is part of "Object Teams Development Tooling"-Software
 
-				Copyright 2010, 2013 GK Software AG and others.
+				Copyright 2010, 2014 GK Software AG and others.
 				All rights reserved. This program and the accompanying materials
 				are made available under the terms of the Eclipse Public License v1.0
 				which accompanies this distribution, and is available at
@@ -45,20 +45,22 @@
 	<!--  ot.maven.repository.path : absolute path to the maven repository on ot.host -->
 	<!--  LOCAL:																	  -->
 	<!--  otre.export.dir : directory where exported otre jars are located:			  -->
-	<!--					org.eclipse.objectteams.runtime_${otre.version}.jar 	  -->
-	<!-- 					otre_min.jar, otre_agent.jar							  -->
+	<!--					org.eclipse.objectteams.otre_${otre.version}.jar	 	  -->
+	<!--					org.eclipse.objectteams.runtime_${otre.version}.jar	 	  -->
+	<!-- 					otre_agent.jar											  -->
 	<!--  ecj.export.dir : directory where the batch compiler jar is located          -->
 
 	<properties>
 		<!-- Object Teams versions, update manually: 					-->
 		<!--   version of the signed ecotj jar file:	 				-->
-		<ecotj.version>R-2.2.0-201306071800-signed</ecotj.version> 
+		<ecotj.version>R-2.3.0-201406101336-signed</ecotj.version> 
 		<!--   version of the org.eclipse.objectteams.runtime plugin:	-->
-		<otre.version>2.2.0.201305210612</otre.version>
+		<otre.version>2.3.0.201406101339</otre.version>
 		
 		<!-- locate the jar files to install/deploy: -->
 	    <ecotj.jar.file>${ecj.export.dir}/ecotj-${ecotj.version}.jar</ecotj.jar.file>
-	    <otre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otre.version}.jar</otre.jar.file>
+	    <otre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.otre_${otre.version}.jar</otre.jar.file>
+	    <ot.runtime.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otre.version}.jar</ot.runtime.jar.file>
 	    <otre-agent.jar.file>${otre.export.dir}-${otre.version}/otre_agent.jar</otre-agent.jar.file>
 	    
     	<!-- Repository path of this module within the Object Teams git: -->
@@ -89,6 +91,24 @@
 				<version>2.4</version>
 				<executions>
 					<execution>
+						<id>deploy-ot-runtime-as-maven-artifact</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>deploy-file</goal>
+						</goals>
+						<configuration>
+							<repositoryId>otEclipseRepo</repositoryId>
+							<packaging>jar</packaging>
+							<url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+							<!-- The file to be deployed -->
+							<file>${ot.runtime.jar.file}</file>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>objectteams-runtime</artifactId>
+							<version>${otj.version}</version>
+							<packaging>jar</packaging>
+						</configuration>
+					</execution>
+					<execution>
 						<id>deploy-otre-as-maven-artifact</id>
 						<phase>deploy</phase>
 						<goals>
@@ -101,9 +121,10 @@
 							<!-- The file to be deployed -->
 							<file>${otre.jar.file}</file>
 							<groupId>${project.groupId}</groupId>
-							<artifactId>objectteams-runtime</artifactId>
+							<artifactId>objectteams-otre</artifactId>
 							<version>${otj.version}</version>
 							<packaging>jar</packaging>
+							<pomFile>objectteams-otre-pom.xml</pomFile>
 						</configuration>
 					</execution>
 					<execution>
@@ -152,6 +173,22 @@
 				<version>2.3</version>
 				<executions>
 					<execution>
+						<id>install-ot-runtime-as-maven-artifact</id>
+						<phase>install</phase>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+						<configuration>
+							<packaging>jar</packaging>
+							<!-- The file to be deployed -->
+							<file>${ot.runtime.jar.file}</file>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>objectteams-runtime</artifactId>
+							<version>${otj.version}</version>
+							<packaging>jar</packaging>
+						</configuration>
+					</execution>
+					<execution>
 						<id>install-otre-as-maven-artifact</id>
 						<phase>install</phase>
 						<goals>
@@ -162,10 +199,10 @@
 							<!-- The file to be deployed -->
 							<file>${otre.jar.file}</file>
 							<groupId>${project.groupId}</groupId>
-							<artifactId>objectteams-runtime</artifactId>
+							<artifactId>objectteams-otre</artifactId>
 							<version>${otj.version}</version>
 							<packaging>jar</packaging>
-							<pomFile>objectteams-runtime-pom.xml</pomFile>
+							<pomFile>objectteams-otre-pom.xml</pomFile>
 						</configuration>
 					</execution>
 					<execution>
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index ae5947e..36a89ca 100644
--- a/maven/infrastructure/parent-pom/pom.xml
+++ b/maven/infrastructure/parent-pom/pom.xml
@@ -4,7 +4,7 @@
 	
 	<groupId>org.eclipse.objectteams</groupId>
 	<artifactId>objectteams-parent-pom</artifactId>
-	<version>2.2.0</version>
+	<version>2.3.0</version>
 	<packaging>pom</packaging>
 	
 	<name>Object Teams parent pom</name>
@@ -23,7 +23,7 @@
 			<comments>
 				This file is part of "Object Teams Development Tooling"-Software.
 
-				Copyright 2010, 2013 GK Software AG and others.
+				Copyright 2010, 2014 GK Software AG and others.
 				All rights reserved. This program and the accompanying materials
 				are made available under the terms of the Eclipse Public License v1.0
 				which accompanies this distribution, and is available at
@@ -82,19 +82,20 @@
     	<project-repository-path>maven/infrastructure/parent-pom</project-repository-path>
 
 		<!-- Our Version: -->
-		<otj.version>2.2.0</otj.version>
+		<otj.version>2.3.0</otj.version>
 
 		<!-- Versions of dependencies: -->
 		<bcel.version>5.2</bcel.version>
-		<tycho.version>0.18.0</tycho.version>
+		<tycho.version>0.20.0</tycho.version>
 		
 		<!-- Absolut paths for providing startup arguments to the JVM -->
-		<otj.otre.location>${settings.localRepository}/org/eclipse/objectteams-runtime/${otj.version}/objectteams-runtime-${otj.version}.jar</otj.otre.location>
-		<otj.agent.location>${settings.localRepository}/org/eclipse/objectteams-otre-agent/${otj.version}/objectteams-otre-agent-${otj.version}-nodep.jar</otj.agent.location>
+		<otj.runtime.location>${settings.localRepository}/org/eclipse/objectteams/objectteams-runtime/${otj.version}/objectteams-runtime-${otj.version}.jar</otj.runtime.location>
+		<otj.otre.location>${settings.localRepository}/org/eclipse/objectteams/objectteams-otre/${otj.version}/objectteams-otre-${otj.version}.jar</otj.otre.location>
+		<otj.agent.location>${settings.localRepository}/org/eclipse/objectteams/objectteams-otre-agent/${otj.version}/objectteams-otre-agent-${otj.version}-nodep.jar</otj.agent.location>
 		<otj.bcel.location>${settings.localRepository}/org/apache/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar</otj.bcel.location>
 
 		<!-- Bootclasspath -->
-		<otj.bootcp.arg>-Xbootclasspath/a:${otj.otre.location}:${otj.bcel.location}:${otj.agent.location}</otj.bootcp.arg>
+		<otj.bootcp.arg>-Xbootclasspath/a:${otj.runtime.location}</otj.bootcp.arg>
 		<!-- Object teams JPLIS agent -->
 		<otj.agent.arg>-javaagent:${otj.agent.location}</otj.agent.arg>
 		<!--
@@ -135,6 +136,7 @@
 						Using java 1.7 language level is recommended, default is 1.3, OT/J needs 1.5 minimum
 					-->
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.1</version>
 					<configuration>
 						<source>1.7</source>
 						<target>1.7</target>
@@ -157,7 +159,7 @@
 						</dependency>
 						<dependency>
 							<!-- plug the OT/J compiler into the tycho-compiler-jdt plug-in: -->
-							<groupId>org.eclipse</groupId>
+							<groupId>org.eclipse.objectteams</groupId>
 							<artifactId>objectteams-otj-compiler</artifactId>
 							<version>${otj.version}</version>
 						</dependency>
@@ -185,7 +187,7 @@
 						</dependency>
 						<dependency>
 							<!-- plug the OT/J compiler into the tycho-compiler-jdt plug-in: -->
-							<groupId>org.eclipse</groupId>
+							<groupId>org.eclipse.objectteams</groupId>
 							<artifactId>objectteams-otj-compiler</artifactId>
 							<version>${otj.version}</version>
 						</dependency>
@@ -206,7 +208,7 @@
 					<dependencies>
 						<dependency>
 							<!-- runtime-only dependency: -->
-							<groupId>org.eclipse</groupId>
+							<groupId>org.eclipse.objectteams</groupId>
 							<artifactId>objectteams-otre-agent</artifactId>
 							<classifier>nodep</classifier>
 							<version>${otj.version}</version>
@@ -240,9 +242,15 @@
 	<!-- Required for compiling and running: -->
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse</groupId>
+			<groupId>org.eclipse.objectteams</groupId>
 			<artifactId>objectteams-runtime</artifactId>
 			<version>${otj.version}</version>
+			<scope>compile</scope> <!-- At runtime this will be provided via bootclasspath -->
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.objectteams</groupId>
+			<artifactId>objectteams-otre</artifactId>
+			<version>${otj.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/maven/infrastructure/parent-pom/src/site/apt/usage.apt b/maven/infrastructure/parent-pom/src/site/apt/usage.apt
index 4261c06..f31be18 100644
--- a/maven/infrastructure/parent-pom/src/site/apt/usage.apt
+++ b/maven/infrastructure/parent-pom/src/site/apt/usage.apt
@@ -3,7 +3,7 @@
 	------
 	Olaf Otto & Stephan Herrmann
 	------
-	2013-06-23
+	2014-06-15
 	------
 
 Using the Object Teams Parent POM
@@ -31,9 +31,9 @@
 
 +-----
 	<parent>
-		<groupId>org.eclipse</groupId>
+		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.2.0</version>
+		<version>2.3.0</version>
 	</parent>
 +-----
 
@@ -48,14 +48,16 @@
 ** Standard OT/J dependencies documented
 
   All OT/J projects using the <<<objectteams-parent-pom>>> implicitly depend on the following artifacts which are developed 
-  independent of maven and simply repackaged using the {{{../objectteams-artifact-deployer}org.eclipse:objectteams-artifact-deployer}} module:
+  independent of maven and simply repackaged using the {{{../objectteams-artifact-deployer}org.eclipse.objectteams:objectteams-artifact-deployer}} module:
   
-  [org.eclipse:objectteams-runtime] the Object Teams runtime repackaged from the <<<org.eclipse.objectteams.runtime>>> OSGi bundle.
+  [org.eclipse.objectteams:objectteams-runtime] the Object Teams runtime (minimal OT/J API) repackaged from the <<<org.eclipse.objectteams.runtime>>> OSGi bundle.
   
-  [org.eclipse:objectteams-otre-agent] the Java agent that hooks the Object Teams runtime into the JVM (repackaged from file <<<otre_agent.jar>>>
+  [org.eclipse.objectteams:objectteams-otre] the Object Teams Runtime Environment (the bytecode weaver) repackaged from the <<<org.eclipse.objectteams.otre>>> OSGi bundle.
+  
+  [org.eclipse.objectteams:objectteams-otre-agent] the Java agent that hooks the Object Teams runtime into the JVM (repackaged from file <<<otre_agent.jar>>>
   from the <<<org.eclipse.objectteams.otdt>>> project).
   
-  [org.eclipse:objectteams-otj-compiler] a compatible replacement for <<<org.eclipse.tycho:org.eclipse.jdt.core>>> that enables the 
+  [org.eclipse.objectteams:objectteams-otj-compiler] a compatible replacement for <<<org.eclipse.tycho:org.eclipse.jdt.core>>> that enables the 
   <<<org.eclipse.tycho:tycho-compiler-jdt>>> plugin to compile OT/J sources.
 
   []
diff --git a/maven/testproject/pom.xml b/maven/testproject/pom.xml
index 0a86fdc..22f75b9 100644
--- a/maven/testproject/pom.xml
+++ b/maven/testproject/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.2.0</version>
+		<version>2.3.0</version>
 	</parent>
 
 	<packaging>jar</packaging>
         
 	<artifactId>objectteams-compile-test</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<name>Object Teams test project</name>
 
 	<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
@@ -27,7 +27,7 @@
 			<comments>
 				This file is part of "Object Teams Development Tooling"-Software
 
-				Copyright 2010, 2013 GK Software AG and others.
+				Copyright 2010, 2014 GK Software AG and others.
 				All rights reserved. This program and the accompanying materials
 				are made available under the terms of the Eclipse Public License v1.0
 				which accompanies this distribution, and is available at
diff --git a/maven/testproject/src/site/apt/usage.apt b/maven/testproject/src/site/apt/usage.apt
index 3ef64c8..6ed5bf0 100644
--- a/maven/testproject/src/site/apt/usage.apt
+++ b/maven/testproject/src/site/apt/usage.apt
@@ -3,12 +3,12 @@
 	------
 	Olaf Otto & Stephan Herrmann
 	------
-	2013-06-23
+	2014-06-15
 	------
 
 Using Object Teams with Maven3
 
- Declaring <<<org.eclipse:objectteams-parent-pom>>> as the parent of your project will add basic capabilities
+ Declaring <<<org.eclipse.objectteams:objectteams-parent-pom>>> as the parent of your project will add basic capabilities
  for using OT/J in your sources.
  
 * Include the parent pom
@@ -31,9 +31,9 @@
 
 +-----
 	<parent>
-		<groupId>org.eclipse</groupId>
+		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.2.0</version>
+		<version>2.3.0</version>
 	</parent>
 +-----