diff --git a/VERSION b/VERSION
index c807441..1700873 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.16.3
+1.16.3-dev
diff --git a/api/bbsim/bbsim.proto b/api/bbsim/bbsim.proto
index 3a32175..336a681 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Open Networking Foundation
+// Copyright 2018-2023 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/api/bbsim/bbsim_dmi.proto b/api/bbsim/bbsim_dmi.proto
index 48c7da9..db4d274 100644
--- a/api/bbsim/bbsim_dmi.proto
+++ b/api/bbsim/bbsim_dmi.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Open Networking Foundation
+// Copyright 2018-2023 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/api/legacy/bbsim.proto b/api/legacy/bbsim.proto
index 6c339b1..73963a1 100644
--- a/api/legacy/bbsim.proto
+++ b/api/legacy/bbsim.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Open Networking Foundation
+// Copyright 2018-2023 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/cmd/bbr/bbr.go b/cmd/bbr/bbr.go
index a421b63..f8dc79d 100644
--- a/cmd/bbr/bbr.go
+++ b/cmd/bbr/bbr.go
@@ -97,3 +97,5 @@
 	}()
 	oltMock.Start()
 }
+
+// [EOF]
diff --git a/cmd/bbsim/bbsim.go b/cmd/bbsim/bbsim.go
index d5d3819..123d046 100644
--- a/cmd/bbsim/bbsim.go
+++ b/cmd/bbsim/bbsim.go
@@ -226,3 +226,5 @@
 		}
 	}()
 }
+
+// [EOF]
diff --git a/cmd/bbsimctl/bbsimctl.go b/cmd/bbsimctl/bbsimctl.go
index 9d1ed93..968cd51 100644
--- a/cmd/bbsimctl/bbsimctl.go
+++ b/cmd/bbsimctl/bbsimctl.go
@@ -61,3 +61,5 @@
 		os.Exit(1)
 	}
 }
+
+// [EOF]
diff --git a/configs/bbsim.yaml b/configs/bbsim.yaml
index 1c55084..ff13b9a 100644
--- a/configs/bbsim.yaml
+++ b/configs/bbsim.yaml
@@ -1,3 +1,5 @@
+# Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+
 ---
 # CLI arguments override values specified here.
 # Commented values show defaults.
diff --git a/tests/bbr.groovy b/tests/bbr.groovy
index f515ba7..a1185e3 100644
--- a/tests/bbr.groovy
+++ b/tests/bbr.groovy
@@ -170,3 +170,5 @@
     }
   }
 }
+
+// [EOF]
diff --git a/tests/bbr.sh b/tests/bbr.sh
index b8bcc78..9be38f4 100644
--- a/tests/bbr.sh
+++ b/tests/bbr.sh
@@ -72,3 +72,4 @@
 
 run
 
+# [EOF]
diff --git a/tools/main.go b/tools/main.go
index 4f3d16d..be00e45 100644
--- a/tools/main.go
+++ b/tools/main.go
@@ -1,3 +1,6 @@
+//go:build tools
+// +build tools
+
 /*
  * Copyright 2018-2023 Open Networking Foundation (ONF) and the ONF Contributors
 
@@ -13,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// +build tools
 
 package tools
 
@@ -21,3 +23,5 @@
 	// protocol buffer compiler plugins
 	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
 )
+
+// [EOF]