diff --git a/pom.xml b/pom.xml
index 4475d45..4a2187a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>tpquery</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>tpquery</name>
+	<name>TPQuery</name>
 	<description>TemplatedPreparedQuery</description>
 	<inceptionYear>2007</inceptionYear>
 	<organization>
@@ -427,13 +427,20 @@
 							<aggregate>true</aggregate>
 							<tags>
 								<tag>@todo</tag>
+								<tag>@TODO</tag>
 								<tag>@deprecated</tag>
+								<tag>@help</tag>
+								<tag>@HELP</tag>
+								<tag>help</tag>
 								<tag>HELP</tag>
+								<tag>todo</tag>
 								<tag>TODO</tag>
+								<tag>fixme</tag>
 								<tag>FIXME</tag>
+								<tag>later</tag>
 								<tag>LATER</tag>
+								<tag>error</tag>
 								<tag>ERROR</tag>
-								<tag>SOMETHING</tag>
 							</tags>
 						</configuration>
 					</plugin>
diff --git a/src/site/site.xml b/src/site/site.xml
index d6e4172..eaec521 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,7 +20,7 @@
 	<skin>
 		<groupId>org.apache.maven.skins</groupId>
 		<artifactId>maven-fluido-skin</artifactId>
-		<version>1.3.1</version>
+		<version>1.4</version>
 	</skin>
 	<custom>
 		<fluidoSkin>
@@ -42,7 +42,6 @@
 		<menu name="TPQuery">
 			<item name="Home" href="index.html" />
 			<item name="Download" href="download.html" />
-			<item name="Versions" href="versions.html" />
 			<item name="Building" href="build.html" />
 			<item name="Todo" href="todo.html" />
 		</menu>
diff --git a/tpquery-executor-jdbc/pom.xml b/tpquery-executor-jdbc/pom.xml
index 412e739..aa1ae31 100644
--- a/tpquery-executor-jdbc/pom.xml
+++ b/tpquery-executor-jdbc/pom.xml
@@ -7,7 +7,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>tpquery-executor-jdbc</artifactId>
-	<name>tpquery-executor-jdbc</name>
+	<name>TPQuery Executor JDBC</name>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/tpquery-executor-jpa/pom.xml b/tpquery-executor-jpa/pom.xml
index defba77..c64848b 100644
--- a/tpquery-executor-jpa/pom.xml
+++ b/tpquery-executor-jpa/pom.xml
@@ -7,6 +7,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>tpquery-executor-jpa</artifactId>
+	<name>TPQuery Executor JPA</name>
 	<dependencies>
 		<dependency>
 			<groupId>net.forwardfire.tpquery</groupId>
diff --git a/tpquery-store/pom.xml b/tpquery-store/pom.xml
index 3d5bb67..b5d03df 100644
--- a/tpquery-store/pom.xml
+++ b/tpquery-store/pom.xml
@@ -7,6 +7,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>tpquery-store</artifactId>
+	<name>TPQuery Store</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>