diff --git a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
index a054648..f6e70c9 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
@@ -2,7 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse</groupId>
+  <groupId>org.eclipse.objectteams</groupId>
   <artifactId>objectteams-runtime</artifactId>
   <version>2.1.2</version>
   <description>The OT/J Runtime Library</description>
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index b7ea147..bbe1517 100644
--- a/maven/infrastructure/artifact-deployer/pom.xml
+++ b/maven/infrastructure/artifact-deployer/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse</groupId>
+		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
 		<version>2.2.0</version>
 		<relativePath>../parent-pom</relativePath>
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index f3a670e..ae5947e 100644
--- a/maven/infrastructure/parent-pom/pom.xml
+++ b/maven/infrastructure/parent-pom/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-	<groupId>org.eclipse</groupId>
+	<groupId>org.eclipse.objectteams</groupId>
 	<artifactId>objectteams-parent-pom</artifactId>
 	<version>2.2.0</version>
 	<packaging>pom</packaging>
@@ -132,12 +132,12 @@
 				<plugin>
 					<!--
 						Use compiler plugin with tycho as the adapter to the OT/J compiler.
-						Using java 1.6 language level is recommended, default is 1.3, OT/J needs 1.5 minimum
+						Using java 1.7 language level is recommended, default is 1.3, OT/J needs 1.5 minimum
 					-->
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 						<compilerId>jdt</compilerId>
 						<flavor>otj</flavor>
 					</configuration>
diff --git a/maven/testproject/pom.xml b/maven/testproject/pom.xml
index b726f10..0a86fdc 100644
--- a/maven/testproject/pom.xml
+++ b/maven/testproject/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse</groupId>
+		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
 		<version>2.2.0</version>
 	</parent>