diff --git a/.gitignore b/.gitignore
index 921dbe8..9985984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.idea
+*.iml
 bazel-bin
 bazel-genfiles
 bazel-istioApigeeAdapter
diff --git a/WORKSPACE b/WORKSPACE
index 9f076a0..c29e9ff 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "com_github_apid_apigeeIstioAdapter")
+workspace(name = "com_github_apid_istioApigeeAdapter")
 
 git_repository(
     name = "io_bazel_rules_go",
@@ -15,6 +15,11 @@
     remote = "https://github.com/istio/mixer.git",
 )
 
+bind(
+    name = "mixer_adapter",
+    actual = "@io_istio_mixer//pkg/adapter:go_default_library",
+)
+
 # Replace the above with the below to build with your own local copy of mixer
 #local_repository(
 #    name = "io_istio_mixer",
diff --git a/adapter/BUILD b/adapter/BUILD
index cde5ace..0379f87 100644
--- a/adapter/BUILD
+++ b/adapter/BUILD
@@ -11,8 +11,8 @@
     ],
     deps = [
         "//adapter/config:go_default_library",
+        "//external:mixer_adapter",
         "@com_github_hashicorp_go_multierror//:go_default_library",
-        "@io_istio_mixer//pkg/adapter:go_default_library",
     ],
 )
 
diff --git a/adapter/config/BUILD b/adapter/config/BUILD
index cdde8c7..7bd0ddd 100644
--- a/adapter/config/BUILD
+++ b/adapter/config/BUILD
@@ -22,5 +22,6 @@
     visibility = ["//adapter:__pkg__"],
     deps = [
         "@com_github_gogo_protobuf//gogoproto:go_default_library",
+        "@com_github_gogo_protobuf//types:go_default_library",
     ],
 )
diff --git a/adapter/config/config.proto b/adapter/config/config.proto
index 6c3c680..ba1c38d 100644
--- a/adapter/config/config.proto
+++ b/adapter/config/config.proto
@@ -14,7 +14,7 @@
 
 syntax = "proto3";
 
-package adapter.apigee.config;
+package adapter.config;
 
 import "gogoproto/gogo.proto";