diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml
index e3fd0258f..34767c964 100644
--- a/openid-connect-client/pom.xml
+++ b/openid-connect-client/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openid-connect-client</artifactId> 
-  <description>OpenID Connect Client Files</description>
+  <description>OpenID Connect Client filter for Spring Security</description>
   <name>OpenID Connect Client</name>
   <dependencies>
     <dependency>
diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml
index 0bdd71dfc..fab193057 100644
--- a/openid-connect-server/pom.xml
+++ b/openid-connect-server/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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>    
     <artifactId>openid-connect-server</artifactId>
-    <name>OpenIdConnect Server</name>
+    <name>OpenID Connect Server</name>
     <packaging>war</packaging>
     <parent>
     	<groupId>org.mitre</groupId>
@@ -16,22 +16,7 @@
 			<artifactId>openid-connect-common</artifactId>
 			<version>0.9.2-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.2.9</version>
-		</dependency>
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.joda</groupId>
-		    <artifactId>joda-convert</artifactId>
-		    <version>1.3</version>
-		</dependency>
-    </dependencies>
+	</dependencies>
     <description>Reference implementation of OpenID Connect spec (http://openid.net/connect/).
     </description>
     <url />
diff --git a/pom.xml b/pom.xml
index 05cea76d5..a125a5eec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -392,6 +392,21 @@
         	<artifactId>nimbus-jose-jwt</artifactId>
         	<version>2.13.0</version>
         </dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.9</version>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.joda</groupId>
+		    <artifactId>joda-convert</artifactId>
+		    <version>1.3</version>
+		</dependency>
     </dependencies>
     <repositories>
         <repository>