diff --git a/apigee_sync.go b/apigee_sync.go
index ae59429..25a590f 100644
--- a/apigee_sync.go
+++ b/apigee_sync.go
@@ -160,7 +160,7 @@
 	tokenActive = false
 
 	form := url.Values{}
-	form.Set("grantType", "client_credentials")
+	form.Set("grant_type", "client_credentials")
 	form.Add("client_id", config.GetString(configConsumerKey))
 	form.Add("client_secret", config.GetString(configConsumerSecret))
 	req, err := http.NewRequest("POST", uri.String(), bytes.NewBufferString(form.Encode()))
diff --git a/apigee_sync_test.go b/apigee_sync_test.go
index 676c4a7..b3a2910 100644
--- a/apigee_sync_test.go
+++ b/apigee_sync_test.go
@@ -46,7 +46,7 @@
 
 				err := req.ParseForm()
 				Expect(err).NotTo(HaveOccurred())
-				Expect(req.Form.Get("grantType")).To(Equal("client_credentials"))
+				Expect(req.Form.Get("grant_type")).To(Equal("client_credentials"))
 				Expect(req.Form.Get("org")).To(Equal(org))
 
 				res := oauthTokenResp{}
diff --git a/listener.go b/listener.go
index cb6ae18..ce6074e 100644
--- a/listener.go
+++ b/listener.go
@@ -43,11 +43,11 @@
 	for _, payload := range snapshot.Tables {
 
 		switch payload.Name {
-		case "apid_config":
+		case "edgex.apid_config":
 			for _, row := range payload.Rows {
 				insertApidConfig(row, db, snapshot.SnapshotInfo)
 			}
-		case "apid_config_scope":
+		case "edgex.apid_config_scope":
 			for _, row := range payload.Rows {
 				insertApidConfigScope(row, db)
 			}
@@ -67,7 +67,7 @@
 	for _, payload := range changes.Changes {
 
 		switch payload.Table {
-		case "public.apid_config_scope", "edgex.apid_config_scope":
+		case "edgex.apid_config_scope":
 			switch payload.Operation {
 			case 1:
 				insertApidConfigScope(payload.NewRow, db)