diff --git a/VERSION b/VERSION
index 0c2c783..eae4a66 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.20
+2.2.21
diff --git a/pkg/mocks/common_test.go b/pkg/db/common.go
similarity index 90%
copy from pkg/mocks/common_test.go
copy to pkg/db/common.go
index 1ff5700..0851ede 100644
--- a/pkg/mocks/common_test.go
+++ b/pkg/db/common.go
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package mocks
+package db
 
 import (
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
@@ -27,7 +27,7 @@
 // the current directory.
 func init() {
 	// Setup this package so that it's log level can be modified at run time
-	_, err := log.AddPackage(log.JSON, logLevel, log.Fields{"instanceId": "mocks"})
+	_, err := log.AddPackage(log.JSON, logLevel, log.Fields{"pkg": "db"})
 	if err != nil {
 		panic(err)
 	}
diff --git a/pkg/mocks/common_test.go b/pkg/mocks/common.go
similarity index 91%
rename from pkg/mocks/common_test.go
rename to pkg/mocks/common.go
index 1ff5700..c20dab1 100644
--- a/pkg/mocks/common_test.go
+++ b/pkg/mocks/common.go
@@ -27,7 +27,7 @@
 // the current directory.
 func init() {
 	// Setup this package so that it's log level can be modified at run time
-	_, err := log.AddPackage(log.JSON, logLevel, log.Fields{"instanceId": "mocks"})
+	_, err := log.AddPackage(log.JSON, logLevel, log.Fields{"pkg": "mocks"})
 	if err != nil {
 		panic(err)
 	}