diff --git a/adapter/BUILD b/adapter/BUILD
index e1b954f1c..9d97305f0 100644
--- a/adapter/BUILD
+++ b/adapter/BUILD
@@ -15,12 +15,12 @@ inventory_library(
         "statsd": "istio.io/mixer/adapter/statsd",
         "stdio": "istio.io/mixer/adapter/stdio",
         "svcctrl": "istio.io/mixer/adapter/svcctrl",
-        "memquota": "istio.io/mixer/adapter/memquota2",
+        "memquota": "istio.io/mixer/adapter/memquota",
     },
     deps = [
         "//adapter/denier:go_default_library",
         "//adapter/list:go_default_library",
-        "//adapter/memquota2:go_default_library",
+        "//adapter/memquota:go_default_library",
         "//adapter/noop:go_default_library",
         "//adapter/prometheus:go_default_library",
         "//adapter/stackdriver:go_default_library",
diff --git a/adapter/memquota2/BUILD b/adapter/memquota/BUILD
similarity index 88%
rename from adapter/memquota2/BUILD
rename to adapter/memquota/BUILD
index 45c0fdb7b..73dcf0c6b 100644
--- a/adapter/memquota2/BUILD
+++ b/adapter/memquota/BUILD
@@ -12,7 +12,7 @@ go_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//adapter/memquota2/config:go_default_library",
+        "//adapter/memquota/config:go_default_library",
         "//pkg/adapter:go_default_library",
         "//pkg/pool:go_default_library",
         "//pkg/status:go_default_library",
@@ -29,7 +29,7 @@ go_test(
     ],
     library = ":go_default_library",
     deps = [
-        "//adapter/memquota2/config:go_default_library",
+        "//adapter/memquota/config:go_default_library",
         "//pkg/adapter:go_default_library",
         "//pkg/adapter/test:go_default_library",
         "//template/quota:go_default_library",
diff --git a/adapter/memquota2/config/BUILD b/adapter/memquota/config/BUILD
similarity index 94%
rename from adapter/memquota2/config/BUILD
rename to adapter/memquota/config/BUILD
index c2a91c884..0d42fb4b0 100644
--- a/adapter/memquota2/config/BUILD
+++ b/adapter/memquota/config/BUILD
@@ -18,7 +18,7 @@ gogoslick_proto_library(
         "config.proto",
     ],
     verbose = 0,
-    visibility = ["//adapter/memquota2:__pkg__"],
+    visibility = ["//adapter/memquota:__pkg__"],
     deps = [
         "@com_github_gogo_protobuf//gogoproto:go_default_library",
         "@com_github_gogo_protobuf//sortkeys:go_default_library",
diff --git a/adapter/memquota2/config/config.proto b/adapter/memquota/config/config.proto
similarity index 100%
rename from adapter/memquota2/config/config.proto
rename to adapter/memquota/config/config.proto
diff --git a/adapter/memquota2/dedup.go b/adapter/memquota/dedup.go
similarity index 100%
rename from adapter/memquota2/dedup.go
rename to adapter/memquota/dedup.go
diff --git a/adapter/memquota2/keys.go b/adapter/memquota/keys.go
similarity index 100%
rename from adapter/memquota2/keys.go
rename to adapter/memquota/keys.go
diff --git a/adapter/memquota2/memquota.go b/adapter/memquota/memquota.go
similarity index 99%
rename from adapter/memquota2/memquota.go
rename to adapter/memquota/memquota.go
index e1fb8abea..23c85cc06 100644
--- a/adapter/memquota2/memquota.go
+++ b/adapter/memquota/memquota.go
@@ -31,7 +31,7 @@ import (
 	"fmt"
 	"time"
 
-	"istio.io/mixer/adapter/memquota2/config"
+	"istio.io/mixer/adapter/memquota/config"
 	"istio.io/mixer/pkg/adapter"
 	"istio.io/mixer/pkg/status"
 	"istio.io/mixer/template/quota"
diff --git a/adapter/memquota2/memquota_test.go b/adapter/memquota/memquota_test.go
similarity index 99%
rename from adapter/memquota2/memquota_test.go
rename to adapter/memquota/memquota_test.go
index f09d81274..e0b89327b 100644
--- a/adapter/memquota2/memquota_test.go
+++ b/adapter/memquota/memquota_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"istio.io/mixer/adapter/memquota2/config"
+	"istio.io/mixer/adapter/memquota/config"
 	"istio.io/mixer/pkg/adapter"
 	"istio.io/mixer/pkg/adapter/test"
 	"istio.io/mixer/template/quota"
diff --git a/adapter/memquota2/rollingWindow.go b/adapter/memquota/rollingWindow.go
similarity index 100%
rename from adapter/memquota2/rollingWindow.go
rename to adapter/memquota/rollingWindow.go
diff --git a/adapter/memquota2/rollingWindow_test.go b/adapter/memquota/rollingWindow_test.go
similarity index 100%
rename from adapter/memquota2/rollingWindow_test.go
rename to adapter/memquota/rollingWindow_test.go