diff --git a/api/src/main/java/org/jboss/seam/faces/viewdata/ViewConfig.java b/api/src/main/java/org/jboss/seam/faces/view/config/ViewConfig.java
similarity index 91%
rename from api/src/main/java/org/jboss/seam/faces/viewdata/ViewConfig.java
rename to api/src/main/java/org/jboss/seam/faces/view/config/ViewConfig.java
index 8e5cf2a..663e12f 100644
--- a/api/src/main/java/org/jboss/seam/faces/viewdata/ViewConfig.java
+++ b/api/src/main/java/org/jboss/seam/faces/view/config/ViewConfig.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.viewdata;
+package org.jboss.seam.faces.view.config;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java b/api/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStore.java
similarity index 94%
rename from api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java
rename to api/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStore.java
index e90ef87..6bd6b94 100644
--- a/api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java
+++ b/api/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStore.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.viewdata;
+package org.jboss.seam.faces.view.config;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -7,7 +7,7 @@
  * @author Stuart Douglas
  *
  */
-public interface ViewDataStore
+public interface ViewConfigStore
 {
 
    /**
diff --git a/api/src/main/java/org/jboss/seam/faces/viewdata/ViewData.java b/api/src/main/java/org/jboss/seam/faces/view/config/ViewPattern.java
similarity index 85%
rename from api/src/main/java/org/jboss/seam/faces/viewdata/ViewData.java
rename to api/src/main/java/org/jboss/seam/faces/view/config/ViewPattern.java
index 7e9de2b..294056e 100644
--- a/api/src/main/java/org/jboss/seam/faces/viewdata/ViewData.java
+++ b/api/src/main/java/org/jboss/seam/faces/view/config/ViewPattern.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.viewdata;
+package org.jboss.seam.faces.view.config;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -16,7 +16,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
-public @interface ViewData
+public @interface ViewPattern
 {
    String value();
 }
diff --git a/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java b/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java
index 215502b..47968b9 100644
--- a/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java
+++ b/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java
@@ -9,7 +9,7 @@
 import javax.inject.Inject;
 
 import org.jboss.logging.Logger;
-import org.jboss.seam.faces.viewdata.ViewDataStore;
+import org.jboss.seam.faces.view.config.ViewConfigStore;
 import org.jboss.seam.persistence.PersistenceContexts;
 import org.jboss.seam.transaction.DefaultTransaction;
 import org.jboss.seam.transaction.SeamTransaction;
@@ -31,7 +31,7 @@ public class TransactionPhaseListener implements PhaseListener
    private static final Logger log = Logger.getLogger(TransactionPhaseListener.class);
 
    @Inject
-   private ViewDataStore dataStore;
+   private ViewConfigStore dataStore;
 
    @Inject
    @DefaultTransaction
diff --git a/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataConfigurationExtension.java b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigExtension.java
similarity index 71%
rename from impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataConfigurationExtension.java
rename to impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigExtension.java
index 7f16106..6723ea3 100644
--- a/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataConfigurationExtension.java
+++ b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigExtension.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.viewdata;
+package org.jboss.seam.faces.view.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -21,10 +21,10 @@
  * @author stuart
  * 
  */
-public class ViewDataConfigurationExtension implements Extension
+public class ViewConfigExtension implements Extension
 {
 
-   private static final Logger log = Logger.getLogger(ViewDataConfigurationExtension.class);
+   private static final Logger log = Logger.getLogger(ViewConfigExtension.class);
 
    private final Map<String, Set<Annotation>> data = new HashMap<String, Set<Annotation>>();
 
@@ -41,16 +41,16 @@ public <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> event)
          {
             for (Field f : tp.getJavaClass().getDeclaredFields())
             {
-               if (f.isAnnotationPresent(ViewData.class))
+               if (f.isAnnotationPresent(ViewPattern.class))
                {
-                  ViewData viewConfig = f.getAnnotation(ViewData.class);
-                  Set<Annotation> viewData = new HashSet<Annotation>();
-                  data.put(viewConfig.value(), viewData);
+                  ViewPattern viewConfig = f.getAnnotation(ViewPattern.class);
+                  Set<Annotation> viewPattern = new HashSet<Annotation>();
+                  data.put(viewConfig.value(), viewPattern);
                   for (Annotation a : f.getAnnotations())
                   {
-                     if (a.annotationType() != ViewData.class)
+                     if (a.annotationType() != ViewPattern.class)
                      {
-                        viewData.add(a);
+                        viewPattern.add(a);
                      }
                   }
                }
diff --git a/impl/src/main/java/org/jboss/seam/faces/security/ViewMetaRestrictEnforcer.java b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigSecurityEnforcer.java
similarity index 62%
rename from impl/src/main/java/org/jboss/seam/faces/security/ViewMetaRestrictEnforcer.java
rename to impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigSecurityEnforcer.java
index 76e22f7..07f0cf7 100644
--- a/impl/src/main/java/org/jboss/seam/faces/security/ViewMetaRestrictEnforcer.java
+++ b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigSecurityEnforcer.java
@@ -1,33 +1,28 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.jboss.seam.faces.security;
+package org.jboss.seam.faces.view.config;
 
 import javax.enterprise.event.Observes;
 import javax.faces.event.AbortProcessingException;
-import javax.faces.event.PostConstructViewMapEvent;
+import javax.faces.event.PreRenderViewEvent;
 import javax.inject.Inject;
+
 import org.jboss.logging.Logger;
-import org.jboss.seam.faces.transaction.TransactionPhaseListener;
-import org.jboss.seam.faces.viewmeta.ViewMetaStore;
+import org.jboss.seam.faces.security.Restrict;
 import org.jboss.seam.solder.el.Expressions;
 
 /**
  *
  * @author bleathem
  */
-public class ViewMetaRestrictEnforcer
+public class ViewConfigSecurityEnforcer
 {
-    private static final Logger log = Logger.getLogger(TransactionPhaseListener.class);
+   private static final Logger log = Logger.getLogger(ViewConfigSecurityEnforcer.class);
 
    @Inject
-   private ViewMetaStore metaStore;
+   private ViewConfigStore metaStore;
    @Inject
    private Expressions expressions;
 
-   public void enforce (@Observes PostConstructViewMapEvent event)
+   public void enforce (@Observes PreRenderViewEvent event)
    {
       log.info("PostConstructViewMapEvent");
       Restrict annotation = metaStore.getDataForCurrentViewId(Restrict.class);
diff --git a/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStoreImpl.java
similarity index 93%
rename from impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java
rename to impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStoreImpl.java
index dfccc25..22fbd25 100644
--- a/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java
+++ b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStoreImpl.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.viewdata;
+package org.jboss.seam.faces.view.config;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -22,7 +22,7 @@
  * 
  */
 @ApplicationScoped
-public class ViewDataStoreImpl implements ViewDataStore
+public class ViewConfigStoreImpl implements ViewConfigStore
 {
    /**
     * cache of viewId to a given data list
@@ -40,7 +40,7 @@ public class ViewDataStoreImpl implements ViewDataStore
     * 
     */
    @Inject
-   public void setup(ViewDataConfigurationExtension extension)
+   public void setup(ViewConfigExtension extension)
    {
       for (Entry<String, Set<Annotation>> e : extension.getData().entrySet())
       {
@@ -120,11 +120,11 @@ private <T extends Annotation> List<T> prepareCache(String viewId, Class<T> type
       if (annotationData == null)
       {
          List<Annotation> newList = new ArrayList<Annotation>();
-         Map<String, Annotation> viewData = data.get(type);
+         Map<String, Annotation> viewPattern = data.get(type);
          List<String> resultingViews = new ArrayList<String>();
-         if (viewData != null)
+         if (viewPattern != null)
          {
-            for (Entry<String, Annotation> e : viewData.entrySet())
+            for (Entry<String, Annotation> e : viewPattern.entrySet())
             {
                if (e.getKey().endsWith("*"))
                {
@@ -147,7 +147,7 @@ private <T extends Annotation> List<T> prepareCache(String viewId, Class<T> type
             Collections.sort(resultingViews, StringLengthComparator.INSTANCE);
             for (String i : resultingViews)
             {
-               newList.add(viewData.get(i));
+               newList.add(viewPattern.get(i));
             }
          }
 
diff --git a/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index d79cbd0..4eae908 100644
--- a/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -2,4 +2,4 @@ org.jboss.seam.faces.component.FormValidationTypeOverrideExtension
 org.jboss.seam.faces.context.ViewScopedExtension
 org.jboss.seam.faces.context.RenderScopedExtension
 org.jboss.seam.faces.context.FacesAnnotationsAdapterExtension
-org.jboss.seam.faces.viewdata.ViewDataConfigurationExtension
+org.jboss.seam.faces.view.config.ViewConfigExtension
diff --git a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/Icon.java b/impl/src/test/java/org/jboss/seam/faces/test/view/config/Icon.java
similarity index 78%
rename from impl/src/test/java/org/jboss/seam/faces/test/viewdata/Icon.java
rename to impl/src/test/java/org/jboss/seam/faces/test/view/config/Icon.java
index 8d67281..afad99b 100644
--- a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/Icon.java
+++ b/impl/src/test/java/org/jboss/seam/faces/test/view/config/Icon.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.test.viewdata;
+package org.jboss.seam.faces.test.view.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/IconLiteral.java b/impl/src/test/java/org/jboss/seam/faces/test/view/config/IconLiteral.java
similarity index 85%
rename from impl/src/test/java/org/jboss/seam/faces/test/viewdata/IconLiteral.java
rename to impl/src/test/java/org/jboss/seam/faces/test/view/config/IconLiteral.java
index 1c6ff27..3c397af 100644
--- a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/IconLiteral.java
+++ b/impl/src/test/java/org/jboss/seam/faces/test/view/config/IconLiteral.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.test.viewdata;
+package org.jboss.seam.faces.test.view.config;
 
 import javax.enterprise.util.AnnotationLiteral;
 
diff --git a/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigEnum.java b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigEnum.java
new file mode 100644
index 0000000..4a860df
--- /dev/null
+++ b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigEnum.java
@@ -0,0 +1,21 @@
+package org.jboss.seam.faces.test.view.config;
+
+import org.jboss.seam.faces.view.config.ViewConfig;
+import org.jboss.seam.faces.view.config.ViewPattern;
+
+@ViewConfig
+public enum ViewConfigEnum
+{
+   @ViewPattern("/*")
+   @Icon("default.gif")
+   DEFAULT,
+   @ViewPattern("/happy/*")
+   @Icon("happy.gif")
+   HAPPY,
+   @ViewPattern("/sad/*")
+   @Icon("sad.gif")
+   SAD,
+   @ViewPattern("/happy/done.xhtml")
+   @Icon("finished.gif")
+   HAPPY_DONE;
+}
diff --git a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataStoreTest.java b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigStoreTest.java
similarity index 83%
rename from impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataStoreTest.java
rename to impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigStoreTest.java
index 54205d4..383d01b 100644
--- a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataStoreTest.java
+++ b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigStoreTest.java
@@ -1,19 +1,19 @@
-package org.jboss.seam.faces.test.viewdata;
+package org.jboss.seam.faces.test.view.config;
 
 import java.util.List;
 
 import junit.framework.Assert;
 
-import org.jboss.seam.faces.viewdata.ViewDataStore;
-import org.jboss.seam.faces.viewdata.ViewDataStoreImpl;
+import org.jboss.seam.faces.view.config.ViewConfigStore;
+import org.jboss.seam.faces.view.config.ViewConfigStoreImpl;
 import org.junit.Test;
 
-public class ViewDataStoreTest
+public class ViewConfigStoreTest
 {
    @Test
-   public void testViewDataStore()
+   public void testViewConfigStore()
    {
-      ViewDataStore store = new ViewDataStoreImpl();
+      ViewConfigStore store = new ViewConfigStoreImpl();
       store.addData("/*", new IconLiteral("default.gif"));
       store.addData("/sad/*", new IconLiteral("sad.gif"));
       store.addData("/happy/*", new IconLiteral("happy.gif"));
diff --git a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataConfigurationTest.java b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigTest.java
similarity index 85%
rename from impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataConfigurationTest.java
rename to impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigTest.java
index bf562fc..0f93a91 100644
--- a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataConfigurationTest.java
+++ b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigTest.java
@@ -1,4 +1,4 @@
-package org.jboss.seam.faces.test.viewdata;
+package org.jboss.seam.faces.test.view.config;
 
 import java.util.List;
 
@@ -8,8 +8,8 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.faces.viewdata.ViewDataStore;
-import org.jboss.seam.faces.viewdata.ViewDataStoreImpl;
+import org.jboss.seam.faces.view.config.ViewConfigStore;
+import org.jboss.seam.faces.view.config.ViewConfigStoreImpl;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -19,24 +19,24 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-public class ViewDataConfigurationTest
+public class ViewConfigTest
 {
 
    @Deployment
    public static Archive<?> createTestArchive()
    {
       JavaArchive archive = ShrinkWrap.create(JavaArchive.class)
-            .addClass(ViewDataStoreImpl.class)
-            .addPackage(ViewDataConfigurationTest.class.getPackage())
+            .addClass(ViewConfigStoreImpl.class)
+            .addPackage(ViewConfigTest.class.getPackage())
             .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
       return archive;
    }
 
    @Inject
-   ViewDataStore store;
+   ViewConfigStore store;
 
    @Test
-   public void testViewDataStore()
+   public void testViewConfigStore()
    {
 
       store.addData("/*", new IconLiteral("default.gif"));
diff --git a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataConfigurationEnum.java b/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataConfigurationEnum.java
deleted file mode 100644
index 9921622..0000000
--- a/impl/src/test/java/org/jboss/seam/faces/test/viewdata/ViewDataConfigurationEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jboss.seam.faces.test.viewdata;
-
-import org.jboss.seam.faces.viewdata.ViewConfig;
-import org.jboss.seam.faces.viewdata.ViewData;
-
-@ViewConfig
-public enum ViewDataConfigurationEnum
-{
-   @ViewData("/*")
-   @Icon("default.gif")
-   DEFAULT,
-   @ViewData("/happy/*")
-   @Icon("happy.gif")
-   HAPPY,
-   @ViewData("/sad/*")
-   @Icon("sad.gif")
-   SAD,
-   @ViewData("/happy/done.xhtml")
-   @Icon("finished.gif")
-   HAPPY_DONE;
-}