diff --git a/tpquery-executor-jdbc/pom.xml b/ff-tpquery-executor-jdbc/pom.xml
similarity index 80%
rename from tpquery-executor-jdbc/pom.xml
rename to ff-tpquery-executor-jdbc/pom.xml
index 8041850..6c01957 100644
--- a/tpquery-executor-jdbc/pom.xml
+++ b/ff-tpquery-executor-jdbc/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.forwardfire.tpquery</groupId>
-		<artifactId>tpquery</artifactId>
+		<artifactId>ff-tpquery</artifactId>
 		<version>1.5.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>tpquery-executor-jdbc</artifactId>
-	<name>TPQuery Executor JDBC</name>
+	<artifactId>ff-tpquery-executor-jdbc</artifactId>
+	<name>FF TPQuery Executor JDBC</name>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -16,4 +16,4 @@
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/SQLExceptionRuntime.java b/ff-tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/SQLExceptionRuntime.java
similarity index 100%
rename from tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/SQLExceptionRuntime.java
rename to ff-tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/SQLExceptionRuntime.java
diff --git a/tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbc.java b/ff-tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbc.java
similarity index 100%
rename from tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbc.java
rename to ff-tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbc.java
diff --git a/tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/package-info.java b/ff-tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/package-info.java
similarity index 100%
rename from tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/package-info.java
rename to ff-tpquery-executor-jdbc/src/main/java/net/forwardfire/tpquery/store/executor/jdbc/package-info.java
diff --git a/tpquery-executor-jdbc/src/test/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbcTest.java b/ff-tpquery-executor-jdbc/src/test/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbcTest.java
similarity index 100%
rename from tpquery-executor-jdbc/src/test/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbcTest.java
rename to ff-tpquery-executor-jdbc/src/test/java/net/forwardfire/tpquery/store/executor/jdbc/TPQExecutorJdbcTest.java
diff --git a/tpquery-executor-jdbc/src/test/resources/net/forwardfire/tpquery/executor/jdbc/test-big.xml b/ff-tpquery-executor-jdbc/src/test/resources/net/forwardfire/tpquery/executor/jdbc/test-big.xml
similarity index 100%
rename from tpquery-executor-jdbc/src/test/resources/net/forwardfire/tpquery/executor/jdbc/test-big.xml
rename to ff-tpquery-executor-jdbc/src/test/resources/net/forwardfire/tpquery/executor/jdbc/test-big.xml
diff --git a/tpquery-executor-jpa/pom.xml b/ff-tpquery-executor-jpa/pom.xml
similarity index 89%
rename from tpquery-executor-jpa/pom.xml
rename to ff-tpquery-executor-jpa/pom.xml
index 95ab174..3c1c7a6 100644
--- a/tpquery-executor-jpa/pom.xml
+++ b/ff-tpquery-executor-jpa/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.forwardfire.tpquery</groupId>
-		<artifactId>tpquery</artifactId>
+		<artifactId>ff-tpquery</artifactId>
 		<version>1.5.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>tpquery-executor-jpa</artifactId>
-	<name>TPQuery Executor JPA</name>
+	<artifactId>ff-tpquery-executor-jpa</artifactId>
+	<name>FF TPQuery Executor JPA</name>
 	<dependencies>
 		<dependency>
 			<groupId>net.forwardfire.tpquery</groupId>
@@ -37,4 +37,4 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpa.java b/ff-tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpa.java
similarity index 100%
rename from tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpa.java
rename to ff-tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpa.java
diff --git a/tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/package-info.java b/ff-tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/package-info.java
similarity index 100%
rename from tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/package-info.java
rename to ff-tpquery-executor-jpa/src/main/java/net/forwardfire/tpquery/store/executor/jpa/package-info.java
diff --git a/tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpaTest.java b/ff-tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpaTest.java
similarity index 100%
rename from tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpaTest.java
rename to ff-tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TPQExecutorJpaTest.java
diff --git a/tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TestEntity.java b/ff-tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TestEntity.java
similarity index 100%
rename from tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TestEntity.java
rename to ff-tpquery-executor-jpa/src/test/java/net/forwardfire/tpquery/store/executor/jpa/TestEntity.java
diff --git a/tpquery-executor-jpa/src/test/resources/META-INF/persistence.xml b/ff-tpquery-executor-jpa/src/test/resources/META-INF/persistence.xml
similarity index 100%
rename from tpquery-executor-jpa/src/test/resources/META-INF/persistence.xml
rename to ff-tpquery-executor-jpa/src/test/resources/META-INF/persistence.xml
diff --git a/tpquery-store/pom.xml b/ff-tpquery-store/pom.xml
similarity index 83%
rename from tpquery-store/pom.xml
rename to ff-tpquery-store/pom.xml
index a054e31..f4d4a90 100644
--- a/tpquery-store/pom.xml
+++ b/ff-tpquery-store/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.forwardfire.tpquery</groupId>
-		<artifactId>tpquery</artifactId>
+		<artifactId>ff-tpquery</artifactId>
 		<version>1.5.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>tpquery-store</artifactId>
-	<name>TPQuery Store</name>
+	<artifactId>ff-tpquery-store</artifactId>
+	<name>FF TPQuery Store</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -20,4 +20,5 @@
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/TPQFactory.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/TPQFactory.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/TPQFactory.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/TPQFactory.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/TPQManager.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/TPQManager.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/TPQManager.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/TPQManager.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigInitializer.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigInitializer.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigInitializer.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigInitializer.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueHolder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueHolder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueHolder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueHolder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQueryNodeBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQueryNodeBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQueryNodeBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQueryNodeBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQConfigBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQConfigBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQConfigBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQConfigBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilderParent.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilderParent.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilderParent.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryBuilderParent.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryParameterBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryParameterBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryParameterBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQueryParameterBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetNodeBuilder.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetNodeBuilder.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetNodeBuilder.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/TPQuerySetNodeBuilder.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/AbstractTPQConfigValidatorParameterPattern.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/AbstractTPQConfigValidatorParameterPattern.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/AbstractTPQConfigValidatorParameterPattern.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/AbstractTPQConfigValidatorParameterPattern.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidator.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidator.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidator.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidator.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheck.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheck.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheck.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheck.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckDescriptionNotBlank.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckDescriptionNotBlank.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckDescriptionNotBlank.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckDescriptionNotBlank.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckNamePattern.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckNamePattern.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckNamePattern.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckNamePattern.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterDefaultValueNotBlank.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterDefaultValueNotBlank.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterDefaultValueNotBlank.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterDefaultValueNotBlank.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterNamePattern.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterNamePattern.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterNamePattern.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterNamePattern.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterTypePattern.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterTypePattern.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterTypePattern.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterTypePattern.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterValueTypePattern.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterValueTypePattern.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterValueTypePattern.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterValueTypePattern.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractTPQueryNode.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractTPQueryNode.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractTPQueryNode.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractTPQueryNode.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractXMLMarshaller.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractXMLMarshaller.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractXMLMarshaller.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/AbstractXMLMarshaller.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuery.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuery.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuery.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuery.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryHint.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryHint.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryHint.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryHint.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryParameter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryParameter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryParameter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQueryParameter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySet.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySet.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySet.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySet.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySetXMLMarshaller.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySetXMLMarshaller.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySetXMLMarshaller.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/TPQuerySetXMLMarshaller.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/model/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/model/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/model/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatement.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatement.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatement.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatement.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatementWriter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatementWriter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatementWriter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/AbstractTPQStatementWriter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatement.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatement.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatement.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatement.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshaller.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshaller.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshaller.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshaller.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshallerAdapter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshallerAdapter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshallerAdapter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementMarshallerAdapter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartInclude.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartInclude.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartInclude.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartInclude.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartParameter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartParameter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartParameter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartParameter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartText.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartText.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartText.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementPartText.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementWriter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementWriter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementWriter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementWriter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHql.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHql.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHql.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHql.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSql.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSql.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSql.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSql.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterList.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterList.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterList.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterList.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterListMapper.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterListMapper.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterListMapper.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterListMapper.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterRaw.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterRaw.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterRaw.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterRaw.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValue.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValue.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValue.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValue.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValueMapper.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValueMapper.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValueMapper.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameterValueMapper.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryParameterMetaData.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryParameterMetaData.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryParameterMetaData.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryParameterMetaData.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStore.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStore.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStore.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStore.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngine.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngine.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngine.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngine.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngineException.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngineException.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngineException.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreScriptEngineException.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatement.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatement.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatement.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatement.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementCache.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementCache.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementCache.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementCache.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementMapper.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementMapper.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementMapper.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/TPQueryStoreStatementMapper.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/AbstractTPQExecutor.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/AbstractTPQExecutor.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/AbstractTPQExecutor.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/AbstractTPQExecutor.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorContext.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorContext.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorContext.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorStatement.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorStatement.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorStatement.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/TPQExecutorStatement.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/executor/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManager.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManager.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManager.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManager.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerConfig.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerConfig.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerConfig.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerConfig.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntry.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntry.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntry.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntry.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryParameterMetaData.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryParameterMetaData.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryParameterMetaData.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryParameterMetaData.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryView.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryView.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryView.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerEntryView.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorStatement.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorStatement.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorStatement.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorStatement.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCache.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCache.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCache.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCache.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/package-info.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryName.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryName.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryName.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryName.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryParameterName.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryParameterName.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryParameterName.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryParameterName.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxy.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxy.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxy.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxy.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactory.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactory.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactory.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactory.java
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/package-info.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/package-info.java
similarity index 100%
rename from tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/package-info.java
rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/proxy/package-info.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/TPQFactoryTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/TPQFactoryTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/TPQFactoryTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/TPQFactoryTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/TPQSpeedTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/TPQSpeedTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/TPQSpeedTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/TPQSpeedTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigBuilderTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigBuilderTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigBuilderTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigBuilderTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigValidatorTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigValidatorTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigValidatorTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigValidatorTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/executor/TQueryExecutorTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/executor/TQueryExecutorTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/executor/TQueryExecutorTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/executor/TQueryExecutorTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/model/TPQueryPropertyTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/model/TPQueryPropertyTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/model/TPQueryPropertyTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/model/TPQueryPropertyTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/model/XMLMarshallerTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/model/XMLMarshallerTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/model/XMLMarshallerTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/model/XMLMarshallerTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerAdapterTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerAdapterTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerAdapterTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerAdapterTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementMarshallerTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementPartIncludeTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementPartIncludeTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementPartIncludeTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementPartIncludeTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementWriterTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementWriterTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementWriterTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/TPQueryStatementWriterTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHqlTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHqlTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHqlTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageHqlTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSqlTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSqlTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSqlTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguageSqlTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterDefaultValueTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterDefaultValueTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterDefaultValueTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterDefaultValueTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeListTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeListTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeListTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeListTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeRawTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeRawTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeRawTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeRawTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeValueTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeValueTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeValueTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/statement/parameter/TPQueryParameterTypeValueTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/store/TPQueryStoreTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/TPQueryStoreTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/store/TPQueryStoreTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/TPQueryStoreTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCacheTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCacheTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCacheTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementCacheTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerTest.java
diff --git a/tpquery-store/src/test/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactoryTest.java b/ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactoryTest.java
similarity index 100%
rename from tpquery-store/src/test/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactoryTest.java
rename to ff-tpquery-store/src/test/java/net/forwardfire/tpquery/store/proxy/TPQueryProxyFactoryTest.java
diff --git a/tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-loop.xml b/ff-tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-loop.xml
similarity index 100%
rename from tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-loop.xml
rename to ff-tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-loop.xml
diff --git a/tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-multiple.xml b/ff-tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-multiple.xml
similarity index 100%
rename from tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-multiple.xml
rename to ff-tpquery-store/src/test/resources/net/forwardfire/tpquery/test-include-multiple.xml
diff --git a/tpquery-store/src/test/resources/net/forwardfire/tpquery/test-query.xml b/ff-tpquery-store/src/test/resources/net/forwardfire/tpquery/test-query.xml
similarity index 100%
rename from tpquery-store/src/test/resources/net/forwardfire/tpquery/test-query.xml
rename to ff-tpquery-store/src/test/resources/net/forwardfire/tpquery/test-query.xml
diff --git a/pom.xml b/pom.xml
index 64491fb..b6cf789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,10 @@
 	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>net.forwardfire.tpquery</groupId>
-	<artifactId>tpquery</artifactId>
+	<artifactId>ff-tpquery</artifactId>
 	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>TPQuery</name>
+	<name>FF TPQuery</name>
 	<description>TemplatedPreparedQuery</description>
 	<inceptionYear>2007</inceptionYear>
 	<organization>
@@ -24,9 +24,9 @@
 		<maven>3.0.1</maven>
 	</prerequisites>
 	<modules>
-		<module>tpquery-executor-jdbc</module>
-		<module>tpquery-executor-jpa</module>
-		<module>tpquery-store</module>
+		<module>ff-tpquery-executor-jdbc</module>
+		<module>ff-tpquery-executor-jpa</module>
+		<module>ff-tpquery-store</module>
 	</modules>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>