diff --git a/html5-comp-lib-examples/pom.xml b/myfaces-html5-examples/pom.xml
similarity index 100%
rename from html5-comp-lib-examples/pom.xml
rename to myfaces-html5-examples/pom.xml
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DateTimeBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DateTimeBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DateTimeBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DateTimeBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DnDBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DnDBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DnDBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/DnDBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputColorBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputColorBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputColorBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputColorBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputNumberBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputNumberBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputNumberBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputNumberBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputTextBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputTextBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputTextBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/InputTextBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/RegisterBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/RegisterBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/RegisterBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/RegisterBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/SportsTeam.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/SportsTeam.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/SportsTeam.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/SportsTeam.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/TestBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/TestBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/TestBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/TestBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/VideoBean.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/VideoBean.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/VideoBean.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/beans/VideoBean.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/servlet/SourceServlet.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/servlet/SourceServlet.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/servlet/SourceServlet.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/servlet/SourceServlet.java
diff --git a/html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/validator/PartNumberValidator.java b/myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/validator/PartNumberValidator.java
similarity index 100%
rename from html5-comp-lib-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/validator/PartNumberValidator.java
rename to myfaces-html5-examples/src/main/java/org/apache/myfaces/html5/examples/showcase/validator/PartNumberValidator.java
diff --git a/html5-comp-lib-examples/src/main/webapp/META-INF/MANIFEST.MF b/myfaces-html5-examples/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/META-INF/MANIFEST.MF
rename to myfaces-html5-examples/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/html5-comp-lib-examples/src/main/webapp/WEB-INF/faces-config.xml b/myfaces-html5-examples/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/WEB-INF/faces-config.xml
rename to myfaces-html5-examples/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/html5-comp-lib-examples/src/main/webapp/WEB-INF/web.xml b/myfaces-html5-examples/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/WEB-INF/web.xml
rename to myfaces-html5-examples/src/main/webapp/WEB-INF/web.xml
diff --git a/html5-comp-lib-examples/src/main/webapp/_template.xhtml b/myfaces-html5-examples/src/main/webapp/_template.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/_template.xhtml
rename to myfaces-html5-examples/src/main/webapp/_template.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/dnd.xhtml b/myfaces-html5-examples/src/main/webapp/dnd.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/dnd.xhtml
rename to myfaces-html5-examples/src/main/webapp/dnd.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/dnd/dnd01.xhtml b/myfaces-html5-examples/src/main/webapp/dnd/dnd01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/dnd/dnd01.xhtml
rename to myfaces-html5-examples/src/main/webapp/dnd/dnd01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/dnd/dnd02.xhtml b/myfaces-html5-examples/src/main/webapp/dnd/dnd02.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/dnd/dnd02.xhtml
rename to myfaces-html5-examples/src/main/webapp/dnd/dnd02.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/dnd/dnd03.xhtml b/myfaces-html5-examples/src/main/webapp/dnd/dnd03.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/dnd/dnd03.xhtml
rename to myfaces-html5-examples/src/main/webapp/dnd/dnd03.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/dnd/dnd04.xhtml b/myfaces-html5-examples/src/main/webapp/dnd/dnd04.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/dnd/dnd04.xhtml
rename to myfaces-html5-examples/src/main/webapp/dnd/dnd04.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/index.xhtml b/myfaces-html5-examples/src/main/webapp/index.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/index.xhtml
rename to myfaces-html5-examples/src/main/webapp/index.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputColor.xhtml b/myfaces-html5-examples/src/main/webapp/inputColor.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputColor.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputColor.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputColor/inputColor01.xhtml b/myfaces-html5-examples/src/main/webapp/inputColor/inputColor01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputColor/inputColor01.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputColor/inputColor01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputDateTime.xhtml b/myfaces-html5-examples/src/main/webapp/inputDateTime.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputDateTime.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputDateTime.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputDateTime/inputDateTime01.xhtml b/myfaces-html5-examples/src/main/webapp/inputDateTime/inputDateTime01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputDateTime/inputDateTime01.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputDateTime/inputDateTime01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputEmail.xhtml b/myfaces-html5-examples/src/main/webapp/inputEmail.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputEmail.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputEmail.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputEmail/inputEmail01.xhtml b/myfaces-html5-examples/src/main/webapp/inputEmail/inputEmail01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputEmail/inputEmail01.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputEmail/inputEmail01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputNumberXXX.xhtml b/myfaces-html5-examples/src/main/webapp/inputNumberXXX.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputNumberXXX.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputNumberXXX.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputNumberXXX/inputNumberXXX01.xhtml b/myfaces-html5-examples/src/main/webapp/inputNumberXXX/inputNumberXXX01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputNumberXXX/inputNumberXXX01.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputNumberXXX/inputNumberXXX01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputNumberXXX/inputNumberXXX02.xhtml b/myfaces-html5-examples/src/main/webapp/inputNumberXXX/inputNumberXXX02.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputNumberXXX/inputNumberXXX02.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputNumberXXX/inputNumberXXX02.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputText.xhtml b/myfaces-html5-examples/src/main/webapp/inputText.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputText.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputText.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputText/inputText01.xhtml b/myfaces-html5-examples/src/main/webapp/inputText/inputText01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputText/inputText01.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputText/inputText01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputText/inputText02.xhtml b/myfaces-html5-examples/src/main/webapp/inputText/inputText02.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputText/inputText02.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputText/inputText02.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputText/inputText03.xhtml b/myfaces-html5-examples/src/main/webapp/inputText/inputText03.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputText/inputText03.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputText/inputText03.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputText/inputText04.xhtml b/myfaces-html5-examples/src/main/webapp/inputText/inputText04.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputText/inputText04.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputText/inputText04.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/inputText/inputText05.xhtml b/myfaces-html5-examples/src/main/webapp/inputText/inputText05.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/inputText/inputText05.xhtml
rename to myfaces-html5-examples/src/main/webapp/inputText/inputText05.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/meterProgress.xhtml b/myfaces-html5-examples/src/main/webapp/meterProgress.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/meterProgress.xhtml
rename to myfaces-html5-examples/src/main/webapp/meterProgress.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/meterProgress/meterProgress01.xhtml b/myfaces-html5-examples/src/main/webapp/meterProgress/meterProgress01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/meterProgress/meterProgress01.xhtml
rename to myfaces-html5-examples/src/main/webapp/meterProgress/meterProgress01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video.xhtml b/myfaces-html5-examples/src/main/webapp/video.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video.xhtml
rename to myfaces-html5-examples/src/main/webapp/video.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video01.xhtml b/myfaces-html5-examples/src/main/webapp/video/video01.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video01.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video01.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video02.xhtml b/myfaces-html5-examples/src/main/webapp/video/video02.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video02.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video02.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video03.xhtml b/myfaces-html5-examples/src/main/webapp/video/video03.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video03.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video03.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video04.xhtml b/myfaces-html5-examples/src/main/webapp/video/video04.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video04.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video04.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video05.xhtml b/myfaces-html5-examples/src/main/webapp/video/video05.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video05.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video05.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video06.xhtml b/myfaces-html5-examples/src/main/webapp/video/video06.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video06.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video06.xhtml
diff --git a/html5-comp-lib-examples/src/main/webapp/video/video07.xhtml b/myfaces-html5-examples/src/main/webapp/video/video07.xhtml
similarity index 100%
rename from html5-comp-lib-examples/src/main/webapp/video/video07.xhtml
rename to myfaces-html5-examples/src/main/webapp/video/video07.xhtml