diff --git a/Makefile b/Makefile
index e6c18613d..32b0e2d57 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ test-template:
 	make -C ./app-service-template test
 
 test-sdk:
+	go mod tidy
 	$(GO) test ./... -coverprofile=coverage.out ./...
 	$(GO) vet ./...
 	gofmt -l .
diff --git a/app-service-template/res/configuration.toml b/app-service-template/res/configuration.toml
index 0e9dfa656..7c040d8a1 100644
--- a/app-service-template/res/configuration.toml
+++ b/app-service-template/res/configuration.toml
@@ -58,7 +58,7 @@ RetryWaitPeriod = "1s"
   AuthType = 'X-Vault-Token'
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = 'http'
   Host = 'localhost'
   Port = 48080
diff --git a/go.mod b/go.mod
index b4449fa32..6c0bc4323 100644
--- a/go.mod
+++ b/go.mod
@@ -16,3 +16,8 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/stretchr/testify v1.7.0
 )
+
+replace (
+	github.com/edgexfoundry/go-mod-bootstrap/v2 => ../MODS/go-mod-bootstrap
+	github.com/edgexfoundry/go-mod-core-contracts/v2 => ../MODS/go-mod-core-contracts
+)