diff --git a/build.md b/build.md
index 6e64de7..784239f 100644
--- a/build.md
+++ b/build.md
@@ -1,4 +1,3 @@
-
 # TPQuery Building
 
 ## Requirements
@@ -28,7 +27,7 @@ mvn -Pbuild -Dusername=(scm_username) clean install release:clean release:prepar
 mvn -Ptest-jacoco clean install
 mvn -Pbuild-site site:site
 
-Optional add -DstagingDirectory=/tmp/tpquery-build-fullsite
+Optional add -DstagingDirectory=/tmp/fullsite
 And then manual upload.
 
 ## Check for dependency-updates
diff --git a/readme.md b/readme.md
index 44a7427..46667b1 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
-TPQuery
+FF-TPQuery
 =========
 
-TPQuery is a java8 library providing templated prepared statements.
+FF-TPQuery is a java8 library providing templated prepared statements.
 
 ## Features
 
diff --git a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java b/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java
index c522c5d..12a2eff 100644
--- a/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java
+++ b/tpquery-store/src/main/java/net/forwardfire/tpquery/config/builder/AbstractTPQBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, Willem Cazander
+ * Copyright (c) 2014-2015, Willem Cazander
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided
@@ -24,6 +24,8 @@ package net.forwardfire.tpquery.config.builder;
 
 import java.util.function.Consumer;
 
+import org.apache.commons.lang3.builder.Builder;
+
 /**
  * Abstract object builder with parent builder.
  * 
@@ -34,7 +36,7 @@ import java.util.function.Consumer;
  * @author Willem Cazander
  * @version 1.0 May 29, 2015
  */
-public abstract class AbstractTPQBuilder<P,T,B> {
+public abstract class AbstractTPQBuilder<P,T,B> implements Builder<P> {
 
 	private final P parent;
 	private final T value;
@@ -63,6 +65,7 @@ public abstract class AbstractTPQBuilder<P,T,B> {
 	 * Builds the result.
 	 * @return	The result.
 	 */
+	@Override
 	public final P build() {
 		buildParent();
 		return getParent();