diff --git a/CHANGES.txt b/CHANGES.txt
index ecd395f83..6a345b516 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@ Features:
 - New exporters: to RDF (as extension)
 - In CSV and TSV importers, added support for ignoring quotation marks
 - Regexp groups capturing GEL function
+- Text facet's choice count limit is now configurable through preference page
 
 Fixes:
 - TSV/CSV exporter bug: Gridworks crashed when there were empty cells.
diff --git a/LICENSE.txt b/LICENSE.txt
index 6efb0a434..93f12da51 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -39,7 +39,7 @@ Apache License 2.0
 ------------------
 
 licenses/apache2.0.LICENSE.txt
-    calendar-parser (package com.metaweb.gridworks.expr.util)
+    calendar-parser (package com.google.gridworks.expr.util)
     ant-tools 
     commons-lang
     commons-codec
diff --git a/README.txt b/README.txt
index 5ecf798f1..374978f7b 100644
--- a/README.txt
+++ b/README.txt
@@ -38,16 +38,16 @@
   -------
 
   This software was created by Metaweb Technology Inc. and originally written
-  and conceived by David Huynh <david@metaweb.com>.
+  and conceived by David Huynh <dfhuynh@google.com>.
   
   This is the full list of contributors (in chronological order):
 
-   - David Huynh <david@metaweb.com>
-   - Stefano Mazzocchi <stefano@metaweb.com>
-   - Vishal Talwar <vishal@metaweb.com> 
-   - Jeff Fry <jfry@metaweb.com>
-   - Will Moffat <willmoffat@metaweb.com>
-   - James Home <jh@metaweb.com>
+   - David Huynh <dfhuynh@google.com>
+   - Stefano Mazzocchi <stefanom@google.com>
+   - Vishal Talwar <vtalwar@google.com> 
+   - Jeff Fry <jfry@google.com>
+   - Will Moffat <wdm@google.com>
+   - James Home <jameshome@google.com>
    - Iain Sproat <iainsproat@gmail.com>
      
 
diff --git a/build.xml b/build.xml
index 8a9041558..2fb1f52d8 100644
--- a/build.xml
+++ b/build.xml
@@ -228,14 +228,14 @@
         <jarbundler 
                 dir="${mac.dir}"
                 name="Gridworks"
-                mainclass="com.metaweb.gridworks.Gridworks" 
+                mainclass="com.google.gridworks.Gridworks" 
                 icon="${graphics.dir}/icon/gridworks.icns"
                 version="${version}"
                 infostring="Gridworks ${version}"
                 aboutmenuname="Gridworks"
                 workingdirectory="$APP_PACKAGE/Contents/Resources"
                 jvmversion="1.6+"
-                bundleid="com.metaweb.gridworks.Gridworks"
+                bundleid="com.google.gridworks.Gridworks"
                 vmoptions="-Xms256M -Xmx1024M -Dgridworks.version=${revision}"
                 antialiasedgraphics="true"
                 antialiasedtext="true"
@@ -267,7 +267,7 @@
                jarPath="server/lib/${fullname}-server.jar" 
                dontWrapJar="true"
                icon="${graphics.dir}/icon/gridworks.ico">
-            <classPath mainClass="com.metaweb.gridworks.Gridworks">
+            <classPath mainClass="com.google.gridworks.Gridworks">
                 <cp>server/lib/*.jar</cp>
             </classPath>
             <jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024">
diff --git a/gridworks b/gridworks
index 923d8dc8c..78a27c1be 100755
--- a/gridworks
+++ b/gridworks
@@ -610,7 +610,7 @@ run() {
                     
     CLASSPATH="$GRIDWORKS_CLASSES_DIR${SEP}$GRIDWORKS_LIB_DIR/*"
 
-    RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks"
+    RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.gridworks.Gridworks"
 
     #echo "$RUN_CMD"
     #echo ""
@@ -662,7 +662,7 @@ broker_run() {
                     
     CLASSPATH="$GRIDWORKS_CLASSES_DIR${SEP}$GRIDWORKS_LIB_DIR/*"
 
-    RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks"
+    RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.gridworks.Gridworks"
 
     #echo "$RUN_CMD"
     #echo ""
diff --git a/gridworks.bat b/gridworks.bat
index 266b65ef3..a7673efba 100644
--- a/gridworks.bat
+++ b/gridworks.bat
@@ -159,7 +159,7 @@ if ""%ACTION%"" == ""run"" goto doRun
 
 :doRun
 set CLASSPATH="%GRIDWORKS_CLASSES_DIR%;%GRIDWORKS_LIB_DIR%\*"
-"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%GRIDWORKS_LIB_DIR%/native/windows com.metaweb.gridworks.Gridworks
+"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%GRIDWORKS_LIB_DIR%/native/windows com.google.gridworks.Gridworks
 goto end
 
 :doAnt