diff --git a/clockgating-plugin/Makefile b/clockgating-plugin/Makefile
index 5b4219e..0e95043 100644
--- a/clockgating-plugin/Makefile
+++ b/clockgating-plugin/Makefile
@@ -1,17 +1,17 @@
-# Copyright 2020-2022 F4PGA Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+# Copyright 2022 AUC Open Source Hardware Lab
+# 
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License. 
+# You may obtain a copy of the License at:
+# 
+# 	  http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
 # limitations under the License.
-#
+# 
 # SPDX-License-Identifier: Apache-2.0
 
 PLUGIN_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
diff --git a/clockgating-plugin/reg_clock_gating.cc b/clockgating-plugin/reg_clock_gating.cc
index ea663e1..677ce5e 100644
--- a/clockgating-plugin/reg_clock_gating.cc
+++ b/clockgating-plugin/reg_clock_gating.cc
@@ -1,17 +1,19 @@
 /*
-    Copyright 2022 AUC Open Source Hardware Lab
+ 	Copyright 2022 AUC Open Source Hardware Lab
+	
+	Licensed under the Apache License, Version 2.0 (the "License"); 
+	you may not use this file except in compliance with the License. 
+	You may obtain a copy of the License at:
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at:
+	    http://www.apache.org/licenses/LICENSE-2.0
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software 
+	distributed under the License is distributed on an "AS IS" BASIS, 
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+	See the License for the specific language governing permissions and 
+	limitations under the License.
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    SPDX-License-Identifier: Apache-2.0
 */
 
 #include "kernel/yosys.h"
diff --git a/clockgating-plugin/tests/Makefile b/clockgating-plugin/tests/Makefile
index 23b9f66..3c2c6f6 100644
--- a/clockgating-plugin/tests/Makefile
+++ b/clockgating-plugin/tests/Makefile
@@ -1,17 +1,17 @@
-# Copyright 2020-2022 F4PGA Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+# Copyright 2022 AUC Open Source Hardware Lab
+# 
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License. 
+# You may obtain a copy of the License at:
+# 
+# 	  http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
 # limitations under the License.
-#
+# 
 # SPDX-License-Identifier: Apache-2.0
 
 TESTS = regfile
diff --git a/clockgating-plugin/tests/regfile/lib/sky130_hd_clkg_blackbox.v b/clockgating-plugin/tests/regfile/lib/sky130_hd_clkg_blackbox.v
index 763097e..eeeef63 100644
--- a/clockgating-plugin/tests/regfile/lib/sky130_hd_clkg_blackbox.v
+++ b/clockgating-plugin/tests/regfile/lib/sky130_hd_clkg_blackbox.v
@@ -1,18 +1,19 @@
-// Copyright 2020-2022 F4PGA Authors
+// Copyright 2022 AUC Open Source Hardware Lab
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License"); 
+// you may not use this file except in compliance with the License. 
+// You may obtain a copy of the License at:
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+// See the License for the specific language governing permissions and 
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
+
  
  (* blackbox *)
 module sky130_fd_sc_hd__dlclkp_1 (
diff --git a/clockgating-plugin/tests/regfile/lib/sky130_hd_ff_map.v b/clockgating-plugin/tests/regfile/lib/sky130_hd_ff_map.v
index e27ca79..e3566d9 100644
--- a/clockgating-plugin/tests/regfile/lib/sky130_hd_ff_map.v
+++ b/clockgating-plugin/tests/regfile/lib/sky130_hd_ff_map.v
@@ -1,15 +1,15 @@
-// Copyright 2020-2022 F4PGA Authors
+// Copyright 2022 AUC Open Source Hardware Lab
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License"); 
+// you may not use this file except in compliance with the License. 
+// You may obtain a copy of the License at:
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+// See the License for the specific language governing permissions and 
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
diff --git a/clockgating-plugin/tests/regfile/regfile.v b/clockgating-plugin/tests/regfile/regfile.v
index 484a1ce..767f5f6 100644
--- a/clockgating-plugin/tests/regfile/regfile.v
+++ b/clockgating-plugin/tests/regfile/regfile.v
@@ -1,15 +1,15 @@
-// Copyright 2020-2022 F4PGA Authors
+// Copyright 2022 AUC Open Source Hardware Lab
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License"); 
+// you may not use this file except in compliance with the License. 
+// You may obtain a copy of the License at:
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+// See the License for the specific language governing permissions and 
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0