diff --git a/.gitignore b/.gitignore
index 0b87e42..21a40d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,3 @@
 *.js_
 *.js.deps
 *.js.map
-
-# Include when developing application packages.
-pubspec.lock
diff --git a/Makefile b/Makefile
index 6944afb..8317a00 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@
 ifdef ANDROID
 	MOJO_ANDROID_FLAGS := --android
 	SYNCBASE_MOJO_BIN_DIR := packages/syncbase/mojo_services/android
-	DISCOVERY_MOJO_BIN_DIR := $(DISCOVERY_DIR)/gen/mojo/android
+	DISCOVERY_MOJO_BIN_DIR := packages/v23discovery/mojo_services/android
 
 	# Location of mounttable on syncslides-alpha network.
 	MOUNTTABLE := /192.168.86.254:8101
@@ -53,7 +53,7 @@
 
 else
 	SYNCBASE_MOJO_BIN_DIR := packages/syncbase/mojo_services/linux_amd64
-	DISCOVERY_MOJO_BIN_DIR := $(DISCOVERY_DIR)/gen/mojo/linux_amd64
+	DISCOVERY_MOJO_BIN_DIR := packages/v23discovery/mojo_services/linux_amd64
 	SYNCBASE_FLAGS += --root-dir=$(PWD)/tmp/syncbase_data --v23.credentials=$(PWD)/creds
 endif
 
diff --git a/lib/src/syncbase/settings_manager.dart b/lib/src/syncbase/settings_manager.dart
index be8e6a5..57ca6a0 100644
--- a/lib/src/syncbase/settings_manager.dart
+++ b/lib/src/syncbase/settings_manager.dart
@@ -251,7 +251,7 @@
     SettingsScanHandler ssh =
         new SettingsScanHandler(_cc, this.updateGamesCallback);
     _cc.discoveryClient
-        .scan(_discoverySettingsKey, "CroupierSettingsAndGame", ssh);
+        .scan(_discoverySettingsKey, 'v.InterfaceName="${util.discoveryInterfaceName}"', ssh);
   }
 
   void stopScanSettings() {
@@ -265,7 +265,7 @@
     _cc.discoveryClient.advertise(
         _discoverySettingsKey,
         DiscoveryClient.serviceMaker(
-            interfaceName: "CroupierSettingsAndGame",
+            interfaceName: util.discoveryInterfaceName,
             addrs: <String>[
               _cc.makeSyncgroupName(suffix),
               _cc.makeSyncgroupName(gameSuffix)
diff --git a/lib/src/syncbase/util.dart b/lib/src/syncbase/util.dart
index 2c6a506..1853bbe 100644
--- a/lib/src/syncbase/util.dart
+++ b/lib/src/syncbase/util.dart
@@ -17,6 +17,8 @@
 const sgSuffix = 'discovery';
 const sgSuffixGame = 'gaming';
 
+const discoveryInterfaceName = 'CroupierSettingsAndGame2';
+
 typedef void NoArgCb();
 typedef void updateCallbackT(String key, String value);
 
diff --git a/pubspec.lock b/pubspec.lock
new file mode 100644
index 0000000..7ac7d5f
--- /dev/null
+++ b/pubspec.lock
@@ -0,0 +1,245 @@
+# Generated by pub
+# See http://pub.dartlang.org/doc/glossary.html#lockfile
+packages:
+  analyzer:
+    description: analyzer
+    source: hosted
+    version: "0.26.2+1"
+  archive:
+    description: archive
+    source: hosted
+    version: "1.0.20"
+  args:
+    description: args
+    source: hosted
+    version: "0.13.2"
+  asn1lib:
+    description: asn1lib
+    source: hosted
+    version: "0.4.1"
+  async:
+    description: async
+    source: hosted
+    version: "1.4.0"
+  barback:
+    description: barback
+    source: hosted
+    version: "0.15.2+7"
+  bignum:
+    description: bignum
+    source: hosted
+    version: "0.0.7"
+  cassowary:
+    description:
+      path: "../../../../../flutter/packages/cassowary"
+      relative: true
+    source: path
+    version: "0.1.7"
+  charcode:
+    description: charcode
+    source: hosted
+    version: "1.1.0"
+  cipher:
+    description: cipher
+    source: hosted
+    version: "0.7.1"
+  collection:
+    description: collection
+    source: hosted
+    version: "1.1.3"
+  convert:
+    description: convert
+    source: hosted
+    version: "1.0.1"
+  crypto:
+    description: crypto
+    source: hosted
+    version: "0.9.1"
+  csslib:
+    description: csslib
+    source: hosted
+    version: "0.12.2"
+  fixnum:
+    description: fixnum
+    source: hosted
+    version: "0.9.1+2"
+  flutter:
+    description:
+      path: "../../../../../flutter/packages/flutter"
+      relative: true
+    source: path
+    version: "0.0.20"
+  flutter_tools:
+    description:
+      path: "../../../../../flutter/packages/flutter_tools"
+      relative: true
+    source: path
+    version: "0.0.38"
+  flx:
+    description:
+      path: "../../../../../flutter/packages/flx"
+      relative: true
+    source: path
+    version: "0.0.10"
+  glob:
+    description: glob
+    source: hosted
+    version: "1.0.5"
+  html:
+    description: html
+    source: hosted
+    version: "0.12.2"
+  http_multi_server:
+    description: http_multi_server
+    source: hosted
+    version: "1.3.2"
+  http_parser:
+    description: http_parser
+    source: hosted
+    version: "1.1.0"
+  intl:
+    description: intl
+    source: hosted
+    version: "0.12.4+2"
+  logging:
+    description: logging
+    source: hosted
+    version: "0.11.2"
+  matcher:
+    description: matcher
+    source: hosted
+    version: "0.12.0+1"
+  material_design_icons:
+    description: material_design_icons
+    source: hosted
+    version: "0.0.3"
+  mime:
+    description: mime
+    source: hosted
+    version: "0.9.3"
+  mojo:
+    description: mojo
+    source: hosted
+    version: "0.4.3"
+  mojo_apptest:
+    description: mojo_apptest
+    source: hosted
+    version: "0.2.8"
+  mojo_sdk:
+    description: mojo_sdk
+    source: hosted
+    version: "0.2.2"
+  mojo_services:
+    description: mojo_services
+    source: hosted
+    version: "0.4.5"
+  mojom:
+    description: mojom
+    source: hosted
+    version: "0.2.8"
+  mustache4dart:
+    description: mustache4dart
+    source: hosted
+    version: "1.0.10"
+  newton:
+    description:
+      path: "../../../../../flutter/packages/newton"
+      relative: true
+    source: path
+    version: "0.1.5"
+  package_config:
+    description: package_config
+    source: hosted
+    version: "0.1.3"
+  path:
+    description: path
+    source: hosted
+    version: "1.3.7"
+  petitparser:
+    description: petitparser
+    source: hosted
+    version: "1.5.0"
+  plugin:
+    description: plugin
+    source: hosted
+    version: "0.1.0"
+  pool:
+    description: pool
+    source: hosted
+    version: "1.2.1"
+  pub_semver:
+    description: pub_semver
+    source: hosted
+    version: "1.2.3"
+  shelf:
+    description: shelf
+    source: hosted
+    version: "0.6.4+2"
+  shelf_static:
+    description: shelf_static
+    source: hosted
+    version: "0.2.3+1"
+  shelf_web_socket:
+    description: shelf_web_socket
+    source: hosted
+    version: "0.0.1+4"
+  sky_engine:
+    description: sky_engine
+    source: hosted
+    version: "0.0.57"
+  sky_services:
+    description: sky_services
+    source: hosted
+    version: "0.0.57"
+  source_map_stack_trace:
+    description: source_map_stack_trace
+    source: hosted
+    version: "1.0.4"
+  source_maps:
+    description: source_maps
+    source: hosted
+    version: "0.10.1"
+  source_span:
+    description: source_span
+    source: hosted
+    version: "1.2.1"
+  stack_trace:
+    description: stack_trace
+    source: hosted
+    version: "1.5.0"
+  string_scanner:
+    description: string_scanner
+    source: hosted
+    version: "0.1.4"
+  syncbase:
+    description: syncbase
+    source: hosted
+    version: "0.0.14"
+  test:
+    description: test
+    source: hosted
+    version: "0.12.5+1"
+  typed_data:
+    description: typed_data
+    source: hosted
+    version: "1.1.1"
+  utf:
+    description: utf
+    source: hosted
+    version: "0.9.0+2"
+  v23discovery:
+    description: v23discovery
+    source: hosted
+    version: "0.0.4"
+  vector_math:
+    description: vector_math
+    source: hosted
+    version: "1.4.3"
+  watcher:
+    description: watcher
+    source: hosted
+    version: "0.9.7"
+  yaml:
+    description: yaml
+    source: hosted
+    version: "2.1.7"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2c3a1a6..cec9db5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,8 +6,4 @@
     path: ../../../../../flutter/packages/flutter
   flutter_tools:
     path: ../../../../../flutter/packages/flutter_tools
-  test: any
-
-dependency_overrides:
-  v23discovery:
-    path: ../../mojo/discovery
\ No newline at end of file
+  test: any
\ No newline at end of file