diff --git a/Makefile b/Makefile
index 63d0051..13b5d0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 the original author or authors.
+# Copyright 2016-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,10 +48,10 @@
 local-protos:
 	@mkdir -p python/local_imports
 ifdef LOCAL_PROTOS
-	rm -rf vendor/github.com/opencord/voltha-protos
+	$(RM) -r vendor/github.com/opencord/voltha-protos
 	mkdir -p vendor/github.com/opencord/voltha-protos/v5/go
 	cp -r ${LOCAL_PROTOS}/go/* vendor/github.com/opencord/voltha-protos/v5/go
-	rm -rf python/local_imports/voltha-protos
+	$(RM) -r python/local_imports/voltha-protos
 	mkdir -p python/local_imports/voltha-protos/dist
 	cp ${LOCAL_PROTOS}/dist/*.tar.gz python/local_imports/voltha-protos/dist/
 endif
@@ -80,7 +80,7 @@
 lint: lint-mod
 
 sca:
-	@rm -rf ./sca-report
+	@$(RM) -r ./sca-report
 	@mkdir -p ./sca-report
 	@echo "Running static code analysis..."
 	@${GOLANGCI_LINT} run --deadline=4m --out-format junit-xml ./... | tee ./sca-report/sca-report.xml
@@ -97,9 +97,11 @@
 
 clean: distclean
 
-distclean:
-	rm -rf ./sca-report ./tests
+distclean sterile:
+	$(RM) -r ./sca-report ./tests
 
 mod-update:
 	${GO} mod tidy
 	${GO} mod vendor
+
+# [EOF]
diff --git a/VERSION b/VERSION
index 1502020..643916c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.3.0
+7.3.1
diff --git a/pkg/events/common.go b/pkg/events/common.go
index 0f0468e..25d9683 100644
--- a/pkg/events/common.go
+++ b/pkg/events/common.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-present Open Networking Foundation
+ * Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index 4947c16..e1485cc 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-present Open Networking Foundation
+ * Copyright 2019-2022 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pkg/grpc/client.go b/pkg/grpc/client.go
index 294983f..3baa1f4 100644
--- a/pkg/grpc/client.go
+++ b/pkg/grpc/client.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present Open Networking Foundation
+ * Copyright 2021-2022 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pkg/kafka/common.go b/pkg/kafka/common.go
index c0d169a..f319d66 100644
--- a/pkg/kafka/common.go
+++ b/pkg/kafka/common.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-present Open Networking Foundation
+ * Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pkg/platform/platform_test.go b/pkg/platform/platform_test.go
index 015a2d3..f68df9a 100644
--- a/pkg/platform/platform_test.go
+++ b/pkg/platform/platform_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-present Open Networking Foundation
+ * Copyright 2018-2022 Open Networking Foundation (ONF) and the ONF Contributors
 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.