diff --git a/build/envsetup.sh b/build/envsetup.sh
index 7813329..5dad6ad 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -5,7 +5,7 @@
 - breakfast:       Setup the build environment, but only list
                    devices we support.
 - brunch:          Sets up build environment using breakfast(),
-                   and then comiles using mka() against bacon target.
+                   and then comiles using mka() against blissify target.
 - mka:             Builds using SCHED_BATCH on all processors.
 - pushboot:        Push a file from your OUT dir to your phone and
                    reboots it, using absolute path.
@@ -230,7 +230,7 @@
 {
     breakfast $*
     if [ $? -eq 0 ]; then
-        time mka bacon
+        time mka blissify
     else
         echo "No such item in brunch menu. Try 'breakfast'"
         return 1
diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index 327e09c..c8bcf57 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -38,7 +38,7 @@
 # set this to the default remote to use in repo
 default_rem = "github"
 # set this to the default revision to use (branch/tag name)
-default_rev = "o8.1"
+default_rev = "p9.0"
 # set this to the remote that you use for projects from your team repos
 # example fetch="https://github.com/omnirom"
 default_team_rem = "github"