diff --git a/Jenkinsfile b/Jenkinsfile
index 6ee6b771e..c1ef5ff51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,14 +7,14 @@ pipeline {
         stage('Build and Test')  {
             steps {
                 dir('') {
-                    sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFile=/srv/libreccm-wildfly.properties' 
+                    sh 'mvn clean package verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFile=/srv/libreccm-wildfly.properties' 
                 }
             }
         }
         stage("Analyse") {
             steps {
                 dir('') {
-                    sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs'
+                    sh 'mvn package pmd:pmd pmd:cpd spotbugs:spotbugs'
                 }
             }
         }
@@ -22,7 +22,7 @@ pipeline {
             steps {
                 dir('') {
                     configFileProvider([configFile(fileId: 'libreccm-packages-deploy', variable: 'MAVEN_SETTINGS')]) {
-                        sh 'mvn -U -s "$MAVEN_SETTINGS" -e deploy'
+                        sh 'mvn -U -s "$MAVEN_SETTINGS" -e package deploy'
                     }
                 }
             }
diff --git a/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java b/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
index 88332b49e..78af38d91 100644
--- a/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
+++ b/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
@@ -39,7 +39,7 @@ import javax.inject.Inject;
  * 
  * <pre>
  * &lt;application&gt;
-        &tl;resource-handler&gt;org.libreccm.ui.CcmFaceletsResourceHandler&lt;/resource-handler&gt;
+        &tl;resource-handler&gt;org.libreccm.mvc.facelets.CcmViewResourceHandler&lt;/resource-handler&gt;
     &lt;/application&gt;
 
  * </pre>
diff --git a/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java b/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
index 04b4a3562..fec82a0e7 100644
--- a/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
+++ b/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
@@ -24,7 +24,7 @@
  * {@code faces-config.xml}:
  * <pre>
  *     &lt;application&gt;
- *         &tl;resource-handler&gt;org.libreccm.ui.CcmFaceletsResourceHandler&lt;/resource-handler&gt;
+ *         &tl;resource-handler&gt;org.libreccm.mvc.facelets.CcmViewResourceHandler&lt;/resource-handler&gt;
  *     &lt;/application&gt;
  * </pre>
  *