diff --git a/LICENSE b/LICENSE
index 1b555676..f433b1a5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,177 @@
-// Copyright (c) {YEAR} RISC Zero, Inc.
-//
-// All rights reserved.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/license-check.py b/license-check.py
index e4241ffd..5b7eb38c 100755
--- a/license-check.py
+++ b/license-check.py
@@ -3,14 +3,9 @@
 import sys
 import os
 from pathlib import Path
-from datetime import date
 import subprocess
 
-CWD = Path('.').absolute()
-
-PRIVATE_HEADER = Path('LICENSE').read_text().splitlines()
-
-PUBLIC_HEADER = '''
+PUBLIC_HEADER = """
 // Copyright {YEAR} RISC Zero, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,67 +19,72 @@
 // 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.
+""".strip().splitlines()
 
-// This code is automatically generated
-'''.strip().splitlines()
-
-ALL_HEADERS = [PRIVATE_HEADER, PUBLIC_HEADER]
-
-IGNORED_DIRS = [
-    Path('.git').absolute(),
-    Path('target').absolute(),
-    Path('tmp').absolute(),
-    Path('zirgen/bootstrap/target').absolute(),
+EXTENSIONS = [
+    ".cpp",
+    ".h",
+    ".rs",
 ]
 
-IGNORED_FILES = []
-
-EXTENSIONS = [
-    '.cpp',
-    '.h',
-    '.rs',
+SKIP_DIRS = [
+    str(Path.cwd()) + "/risc0/cargo-risczero/templates/rust-starter",
+    str(Path.cwd()) + "/risc0/sys/cxx/vendor",
+    str(Path.cwd()) + "/risc0/zkvm/src/host/protos",
+    str(Path.cwd()) + "/risc0/zkvm/src/host/server/exec",
 ]
 
 
 def check_header(expected_year, lines_actual):
-    errs = []
-    for lines_expected in ALL_HEADERS:
-        for (expected, actual) in zip(lines_expected, lines_actual):
-            expected = expected.replace('{YEAR}', expected_year)
-            if expected != actual:
-                errs.append((expected, actual))
-                break
-    if len(errs) == len(ALL_HEADERS):
-        return errs[0]
+    for expected, actual in zip(PUBLIC_HEADER, lines_actual):
+        expected = expected.replace("{YEAR}", expected_year)
+        if expected != actual:
+            return (expected, actual)
     return None
 
 
-def check_file(file):
-    cmd = ['git', 'log', '-1', '--format=%ad', '--date=format:%Y', file]
-    expected_year = subprocess.check_output(cmd, encoding='UTF-8').strip()
-    rel_path = file.relative_to(CWD)
+def check_file(root, file):
+    cmd = ["git", "log", "-1", "--format=%ad", "--date=format:%Y", file]
+    expected_year = subprocess.check_output(cmd, encoding="UTF-8").strip()
+    rel_path = file.relative_to(root)
     lines = file.read_text().splitlines()
     result = check_header(expected_year, lines)
     if result:
-        print(f'{rel_path}: invalid header!')
-        print(f'  expected: {result[0]}')
-        print(f'    actual: {result[1]}')
+        print(f"{rel_path}: invalid header!")
+        print(f"  expected: {result[0]}")
+        print(f"    actual: {result[1]}")
         return 1
     return 0
 
 
+def repo_root():
+    """Return an absolute Path to the repo root"""
+    cmd = ["git", "rev-parse", "--show-toplevel"]
+    return Path(subprocess.check_output(cmd, encoding="UTF-8").strip())
+
+
+def tracked_files():
+    """Yield all file paths tracked by git"""
+    cmd = ["git", "ls-tree", "--full-tree", "--name-only", "-r", "HEAD"]
+    tree = subprocess.check_output(cmd, encoding="UTF-8").strip()
+    for path in tree.splitlines():
+        yield (repo_root() / Path(path)).absolute()
+
+
 def main():
+    root = repo_root()
     ret = 0
-    for root, dirs, files in os.walk('.'):
-        root = Path(root).absolute()
-        if root in IGNORED_DIRS:
-            dirs[:] = []
-            continue
-        for file in files:
-            file = Path(file)
-            path = root / file
-            if path not in IGNORED_FILES and file.suffix in EXTENSIONS:
-                ret |= check_file(root / file)
+    for path in tracked_files():
+        if path.suffix in EXTENSIONS and ".inc" not in path.suffixes:
+            skip = False
+            for path_start in SKIP_DIRS:
+                if str(path).startswith(path_start):
+                    skip = True
+                    break
+            if skip:
+                continue
+
+            ret |= check_file(root, path)
     sys.exit(ret)
 
 
diff --git a/risc0/core/elf.cpp b/risc0/core/elf.cpp
index 2150d8fc..8691ed24 100644
--- a/risc0/core/elf.cpp
+++ b/risc0/core/elf.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 
diff --git a/risc0/core/elf.h b/risc0/core/elf.h
index d6846a9e..7b2d0ae9 100644
--- a/risc0/core/elf.h
+++ b/risc0/core/elf.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/risc0/core/log.cpp b/risc0/core/log.cpp
index 58b4fb79..a3faf77e 100644
--- a/risc0/core/log.cpp
+++ b/risc0/core/log.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/log.h"
 
diff --git a/risc0/core/log.h b/risc0/core/log.h
index ac2bf524..384915b1 100644
--- a/risc0/core/log.h
+++ b/risc0/core/log.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/risc0/core/source_loc.h b/risc0/core/source_loc.h
index dbf498c6..b85524b4 100644
--- a/risc0/core/source_loc.h
+++ b/risc0/core/source_loc.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/risc0/core/test/gtest_main.cpp b/risc0/core/test/gtest_main.cpp
index c67b3c9f..fa3e2b9c 100644
--- a/risc0/core/test/gtest_main.cpp
+++ b/risc0/core/test/gtest_main.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/log.h"
 
diff --git a/risc0/core/test/usermode.cpp b/risc0/core/test/usermode.cpp
index b588d72c..3a38e83e 100644
--- a/risc0/core/test/usermode.cpp
+++ b/risc0/core/test/usermode.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <unistd.h>
 
diff --git a/risc0/core/util.cpp b/risc0/core/util.cpp
index e11bdeb2..193e2007 100644
--- a/risc0/core/util.cpp
+++ b/risc0/core/util.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/util.h"
 
diff --git a/risc0/core/util.h b/risc0/core/util.h
index 7148fb21..2ffcd6b7 100644
--- a/risc0/core/util.h
+++ b/risc0/core/util.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/risc0/fp/fp.h b/risc0/fp/fp.h
index 5824a818..fd962f17 100644
--- a/risc0/fp/fp.h
+++ b/risc0/fp/fp.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/risc0/fp/fpext.h b/risc0/fp/fpext.h
index 0b41f69d..e340b980 100644
--- a/risc0/fp/fpext.h
+++ b/risc0/fp/fpext.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Conversions/Typing/BuiltinComponents.cpp b/zirgen/Conversions/Typing/BuiltinComponents.cpp
index 4382cbda..705535b7 100644
--- a/zirgen/Conversions/Typing/BuiltinComponents.cpp
+++ b/zirgen/Conversions/Typing/BuiltinComponents.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Conversions/Typing/BuiltinComponents.h"
 
diff --git a/zirgen/Conversions/Typing/BuiltinComponents.h b/zirgen/Conversions/Typing/BuiltinComponents.h
index a50ddc25..a95286cf 100644
--- a/zirgen/Conversions/Typing/BuiltinComponents.h
+++ b/zirgen/Conversions/Typing/BuiltinComponents.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Conversions/Typing/ComponentManager.cpp b/zirgen/Conversions/Typing/ComponentManager.cpp
index 41441782..79c64175 100644
--- a/zirgen/Conversions/Typing/ComponentManager.cpp
+++ b/zirgen/Conversions/Typing/ComponentManager.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Conversions/Typing/ComponentManager.h"
 #include "zirgen/Conversions/Typing/BuiltinComponents.h"
diff --git a/zirgen/Conversions/Typing/ComponentManager.h b/zirgen/Conversions/Typing/ComponentManager.h
index 81ce1685..6b331c83 100644
--- a/zirgen/Conversions/Typing/ComponentManager.h
+++ b/zirgen/Conversions/Typing/ComponentManager.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Conversions/Typing/ZhlComponent.cpp b/zirgen/Conversions/Typing/ZhlComponent.cpp
index d604105d..0eb1613f 100644
--- a/zirgen/Conversions/Typing/ZhlComponent.cpp
+++ b/zirgen/Conversions/Typing/ZhlComponent.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Conversions/Typing/ZhlComponent.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
diff --git a/zirgen/Conversions/Typing/ZhlComponent.h b/zirgen/Conversions/Typing/ZhlComponent.h
index 90a5f1e2..f4231daa 100644
--- a/zirgen/Conversions/Typing/ZhlComponent.h
+++ b/zirgen/Conversions/Typing/ZhlComponent.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/BigInt/IR/BigInt.h b/zirgen/Dialect/BigInt/IR/BigInt.h
index fa6c66b7..d23566e9 100644
--- a/zirgen/Dialect/BigInt/IR/BigInt.h
+++ b/zirgen/Dialect/BigInt/IR/BigInt.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/BigInt/IR/Dialect.cpp b/zirgen/Dialect/BigInt/IR/Dialect.cpp
index 76afe361..51afb29b 100644
--- a/zirgen/Dialect/BigInt/IR/Dialect.cpp
+++ b/zirgen/Dialect/BigInt/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/BigInt/IR/BigInt.h"
 
diff --git a/zirgen/Dialect/BigInt/IR/Dialect.td b/zirgen/Dialect/BigInt/IR/Dialect.td
index 9150f2e0..f962f472 100644
--- a/zirgen/Dialect/BigInt/IR/Dialect.td
+++ b/zirgen/Dialect/BigInt/IR/Dialect.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef BIGINT_DIALECT
 #define BIGINT_DIALECT
diff --git a/zirgen/Dialect/BigInt/IR/Eval.cpp b/zirgen/Dialect/BigInt/IR/Eval.cpp
index f16c616f..89531fa2 100644
--- a/zirgen/Dialect/BigInt/IR/Eval.cpp
+++ b/zirgen/Dialect/BigInt/IR/Eval.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/TypeSwitch.h"
diff --git a/zirgen/Dialect/BigInt/IR/Eval.h b/zirgen/Dialect/BigInt/IR/Eval.h
index b269a479..c172aa07 100644
--- a/zirgen/Dialect/BigInt/IR/Eval.h
+++ b/zirgen/Dialect/BigInt/IR/Eval.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/BigInt/IR/Interfaces.td b/zirgen/Dialect/BigInt/IR/Interfaces.td
index 80010510..1b65ba6b 100644
--- a/zirgen/Dialect/BigInt/IR/Interfaces.td
+++ b/zirgen/Dialect/BigInt/IR/Interfaces.td
@@ -1,3 +1,16 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "mlir/IR/SymbolInterfaces.td"
diff --git a/zirgen/Dialect/BigInt/IR/Ops.cpp b/zirgen/Dialect/BigInt/IR/Ops.cpp
index b30accfb..57cbc5ec 100644
--- a/zirgen/Dialect/BigInt/IR/Ops.cpp
+++ b/zirgen/Dialect/BigInt/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Builders.h"
 #include "llvm/ADT/APSInt.h"
diff --git a/zirgen/Dialect/BigInt/IR/Ops.td b/zirgen/Dialect/BigInt/IR/Ops.td
index b803784b..e588e239 100644
--- a/zirgen/Dialect/BigInt/IR/Ops.td
+++ b/zirgen/Dialect/BigInt/IR/Ops.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "zirgen/Dialect/BigInt/IR/Dialect.td"
diff --git a/zirgen/Dialect/BigInt/IR/Types.td b/zirgen/Dialect/BigInt/IR/Types.td
index 6668b32b..16aaa460 100644
--- a/zirgen/Dialect/BigInt/IR/Types.td
+++ b/zirgen/Dialect/BigInt/IR/Types.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/Zll/IR/Interfaces.td"
diff --git a/zirgen/Dialect/BigInt/IR/test/test.cpp b/zirgen/Dialect/BigInt/IR/test/test.cpp
index 45bca4ba..58a7c540 100644
--- a/zirgen/Dialect/BigInt/IR/test/test.cpp
+++ b/zirgen/Dialect/BigInt/IR/test/test.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/Passes.h"
diff --git a/zirgen/Dialect/BigInt/Transforms/LowerModularInv.cpp b/zirgen/Dialect/BigInt/Transforms/LowerModularInv.cpp
index b4656885..f57400b4 100644
--- a/zirgen/Dialect/BigInt/Transforms/LowerModularInv.cpp
+++ b/zirgen/Dialect/BigInt/Transforms/LowerModularInv.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/BigInt/Transforms/LowerReduce.cpp b/zirgen/Dialect/BigInt/Transforms/LowerReduce.cpp
index b7962654..26fe85bb 100644
--- a/zirgen/Dialect/BigInt/Transforms/LowerReduce.cpp
+++ b/zirgen/Dialect/BigInt/Transforms/LowerReduce.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/BigInt/Transforms/LowerZll.cpp b/zirgen/Dialect/BigInt/Transforms/LowerZll.cpp
index 01d62b1b..1022b455 100644
--- a/zirgen/Dialect/BigInt/Transforms/LowerZll.cpp
+++ b/zirgen/Dialect/BigInt/Transforms/LowerZll.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/BigInt/Transforms/PassDetail.h b/zirgen/Dialect/BigInt/Transforms/PassDetail.h
index fdaa4624..f2360600 100644
--- a/zirgen/Dialect/BigInt/Transforms/PassDetail.h
+++ b/zirgen/Dialect/BigInt/Transforms/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/BigInt/Transforms/Passes.h b/zirgen/Dialect/BigInt/Transforms/Passes.h
index 8b6152b5..a7592eca 100644
--- a/zirgen/Dialect/BigInt/Transforms/Passes.h
+++ b/zirgen/Dialect/BigInt/Transforms/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/BigInt/Transforms/Passes.td b/zirgen/Dialect/BigInt/Transforms/Passes.td
index edc46268..7d1ce097 100644
--- a/zirgen/Dialect/BigInt/Transforms/Passes.td
+++ b/zirgen/Dialect/BigInt/Transforms/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef BIGINT_TRANSFORM_PASSES
 #define BIGINT_TRANSFORM_PASSES
 
diff --git a/zirgen/Dialect/IOP/IR/Dialect.cpp b/zirgen/Dialect/IOP/IR/Dialect.cpp
index c0e0f763..57967c99 100644
--- a/zirgen/Dialect/IOP/IR/Dialect.cpp
+++ b/zirgen/Dialect/IOP/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/IOP/IR/IR.h"
 #include "zirgen/Dialect/Zll/IR/Interpreter.h"
diff --git a/zirgen/Dialect/IOP/IR/Dialect.td b/zirgen/Dialect/IOP/IR/Dialect.td
index d0db43cf..e063d811 100644
--- a/zirgen/Dialect/IOP/IR/Dialect.td
+++ b/zirgen/Dialect/IOP/IR/Dialect.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef IOP_DIALECT
 #define IOP_DIALECT
diff --git a/zirgen/Dialect/IOP/IR/IR.h b/zirgen/Dialect/IOP/IR/IR.h
index 2edbd2a3..c8994b83 100644
--- a/zirgen/Dialect/IOP/IR/IR.h
+++ b/zirgen/Dialect/IOP/IR/IR.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/IOP/IR/Ops.cpp b/zirgen/Dialect/IOP/IR/Ops.cpp
index de6e119f..6daa3462 100644
--- a/zirgen/Dialect/IOP/IR/Ops.cpp
+++ b/zirgen/Dialect/IOP/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/IOP/IR/IR.h"
 #include "zirgen/Dialect/Zll/IR/Interpreter.h"
diff --git a/zirgen/Dialect/IOP/IR/Ops.td b/zirgen/Dialect/IOP/IR/Ops.td
index 4a67a74c..76cf021b 100644
--- a/zirgen/Dialect/IOP/IR/Ops.td
+++ b/zirgen/Dialect/IOP/IR/Ops.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "zirgen/Dialect/IOP/IR/Types.td"
diff --git a/zirgen/Dialect/IOP/IR/Types.td b/zirgen/Dialect/IOP/IR/Types.td
index f09fcc0c..fb6261d9 100644
--- a/zirgen/Dialect/IOP/IR/Types.td
+++ b/zirgen/Dialect/IOP/IR/Types.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/IOP/IR/Dialect.td"
diff --git a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/PassDetail.h b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/PassDetail.h
index 42740f64..8f95a602 100644
--- a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/PassDetail.h
+++ b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.h b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.h
index ef9562f6..61c8c8c3 100644
--- a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.h
+++ b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.td b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.td
index 057679a1..36a1f5f9 100644
--- a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.td
+++ b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef R1CS_CONVERSION_PASSES
 #define R1CS_CONVERSION_PASSES
 
diff --git a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/R1CSToBigInt.cpp b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/R1CSToBigInt.cpp
index 28b94f16..7b7f1bd3 100644
--- a/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/R1CSToBigInt.cpp
+++ b/zirgen/Dialect/R1CS/Conversion/R1CSToBigInt/R1CSToBigInt.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/PatternMatch.h"
diff --git a/zirgen/Dialect/R1CS/IR/Attrs.td b/zirgen/Dialect/R1CS/IR/Attrs.td
index 0ef9fe88..ca326c92 100644
--- a/zirgen/Dialect/R1CS/IR/Attrs.td
+++ b/zirgen/Dialect/R1CS/IR/Attrs.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/R1CS/IR/Dialect.td"
 
diff --git a/zirgen/Dialect/R1CS/IR/Dialect.cpp b/zirgen/Dialect/R1CS/IR/Dialect.cpp
index b86b7449..1763794f 100644
--- a/zirgen/Dialect/R1CS/IR/Dialect.cpp
+++ b/zirgen/Dialect/R1CS/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/R1CS/IR/R1CS.h"
 
diff --git a/zirgen/Dialect/R1CS/IR/Dialect.td b/zirgen/Dialect/R1CS/IR/Dialect.td
index aeea45da..fb4f93e5 100644
--- a/zirgen/Dialect/R1CS/IR/Dialect.td
+++ b/zirgen/Dialect/R1CS/IR/Dialect.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef R1CS_DIALECT
 #define R1CS_DIALECT
diff --git a/zirgen/Dialect/R1CS/IR/Ops.cpp b/zirgen/Dialect/R1CS/IR/Ops.cpp
index 12ac0b28..29fda74b 100644
--- a/zirgen/Dialect/R1CS/IR/Ops.cpp
+++ b/zirgen/Dialect/R1CS/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/R1CS/IR/R1CS.h"
 
diff --git a/zirgen/Dialect/R1CS/IR/Ops.td b/zirgen/Dialect/R1CS/IR/Ops.td
index d2faed6d..5f737486 100644
--- a/zirgen/Dialect/R1CS/IR/Ops.td
+++ b/zirgen/Dialect/R1CS/IR/Ops.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "zirgen/Dialect/R1CS/IR/Dialect.td"
diff --git a/zirgen/Dialect/R1CS/IR/R1CS.h b/zirgen/Dialect/R1CS/IR/R1CS.h
index dba551e5..19599f8d 100644
--- a/zirgen/Dialect/R1CS/IR/R1CS.h
+++ b/zirgen/Dialect/R1CS/IR/R1CS.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/R1CS/IR/Types.cpp b/zirgen/Dialect/R1CS/IR/Types.cpp
index 4a60c0f4..781714f7 100644
--- a/zirgen/Dialect/R1CS/IR/Types.cpp
+++ b/zirgen/Dialect/R1CS/IR/Types.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Types.h"
 #include "mlir/IR/Builders.h"
diff --git a/zirgen/Dialect/R1CS/IR/Types.td b/zirgen/Dialect/R1CS/IR/Types.td
index fcb00eaf..41c01d25 100644
--- a/zirgen/Dialect/R1CS/IR/Types.td
+++ b/zirgen/Dialect/R1CS/IR/Types.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/R1CS/IR/Dialect.td"
diff --git a/zirgen/Dialect/ZHL/IR/Attrs.td b/zirgen/Dialect/ZHL/IR/Attrs.td
index 0a7c6063..63454758 100644
--- a/zirgen/Dialect/ZHL/IR/Attrs.td
+++ b/zirgen/Dialect/ZHL/IR/Attrs.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/ZHL/IR/Dialect.td"
 
diff --git a/zirgen/Dialect/ZHL/IR/Dialect.cpp b/zirgen/Dialect/ZHL/IR/Dialect.cpp
index 3173a087..9838d5a6 100644
--- a/zirgen/Dialect/ZHL/IR/Dialect.cpp
+++ b/zirgen/Dialect/ZHL/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHL/IR/ZHL.h"
 
diff --git a/zirgen/Dialect/ZHL/IR/Dialect.td b/zirgen/Dialect/ZHL/IR/Dialect.td
index f8db672e..634d3b94 100644
--- a/zirgen/Dialect/ZHL/IR/Dialect.td
+++ b/zirgen/Dialect/ZHL/IR/Dialect.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef ZHL_DIALECT
 #define ZHL_DIALECT
diff --git a/zirgen/Dialect/ZHL/IR/Ops.cpp b/zirgen/Dialect/ZHL/IR/Ops.cpp
index 7a818ff6..b6500c32 100644
--- a/zirgen/Dialect/ZHL/IR/Ops.cpp
+++ b/zirgen/Dialect/ZHL/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHL/IR/ZHL.h"
 
diff --git a/zirgen/Dialect/ZHL/IR/Ops.td b/zirgen/Dialect/ZHL/IR/Ops.td
index 7e08885a..259db4d5 100644
--- a/zirgen/Dialect/ZHL/IR/Ops.td
+++ b/zirgen/Dialect/ZHL/IR/Ops.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "zirgen/Dialect/ZHL/IR/Dialect.td"
diff --git a/zirgen/Dialect/ZHL/IR/Types.cpp b/zirgen/Dialect/ZHL/IR/Types.cpp
index c56cb6fc..d11063db 100644
--- a/zirgen/Dialect/ZHL/IR/Types.cpp
+++ b/zirgen/Dialect/ZHL/IR/Types.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Types.h"
 #include "mlir/IR/Builders.h"
diff --git a/zirgen/Dialect/ZHL/IR/Types.td b/zirgen/Dialect/ZHL/IR/Types.td
index 6243fefa..4572796e 100644
--- a/zirgen/Dialect/ZHL/IR/Types.td
+++ b/zirgen/Dialect/ZHL/IR/Types.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/ZHL/IR/Dialect.td"
diff --git a/zirgen/Dialect/ZHL/IR/ZHL.h b/zirgen/Dialect/ZHL/IR/ZHL.h
index 06b61d30..7f50205f 100644
--- a/zirgen/Dialect/ZHL/IR/ZHL.h
+++ b/zirgen/Dialect/ZHL/IR/ZHL.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZHLT/IR/Attrs.td b/zirgen/Dialect/ZHLT/IR/Attrs.td
index e69de29b..1d14d8e7 100644
--- a/zirgen/Dialect/ZHLT/IR/Attrs.td
+++ b/zirgen/Dialect/ZHLT/IR/Attrs.td
@@ -0,0 +1,14 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
diff --git a/zirgen/Dialect/ZHLT/IR/Codegen.cpp b/zirgen/Dialect/ZHLT/IR/Codegen.cpp
index 8db07fa0..fcf23012 100644
--- a/zirgen/Dialect/ZHLT/IR/Codegen.cpp
+++ b/zirgen/Dialect/ZHLT/IR/Codegen.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/ZHLT.h"
 #include "zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.h"
diff --git a/zirgen/Dialect/ZHLT/IR/Codegen.h b/zirgen/Dialect/ZHLT/IR/Codegen.h
index 1bff2d52..0ed47a45 100644
--- a/zirgen/Dialect/ZHLT/IR/Codegen.h
+++ b/zirgen/Dialect/ZHLT/IR/Codegen.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/ZHLT.h"
 
diff --git a/zirgen/Dialect/ZHLT/IR/ComponentOps.cpp b/zirgen/Dialect/ZHLT/IR/ComponentOps.cpp
index ead5c2b0..ba75f6ac 100644
--- a/zirgen/Dialect/ZHLT/IR/ComponentOps.cpp
+++ b/zirgen/Dialect/ZHLT/IR/ComponentOps.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/TypeUtils.h"
 #include "zirgen/Dialect/ZHLT/IR/ZHLT.h"
diff --git a/zirgen/Dialect/ZHLT/IR/ComponentOps.td b/zirgen/Dialect/ZHLT/IR/ComponentOps.td
index 0caa5533..f832341c 100644
--- a/zirgen/Dialect/ZHLT/IR/ComponentOps.td
+++ b/zirgen/Dialect/ZHLT/IR/ComponentOps.td
@@ -1,6 +1,18 @@
-// Copyright (c) 2024 RISC Zero, Inc.
-
-// Operations dealing with compoents and generated code.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
+// Operations dealing with components and generated code.
 
 include "mlir/IR/OpBase.td"
 include "mlir/Interfaces/FunctionInterfaces.td"
diff --git a/zirgen/Dialect/ZHLT/IR/Dialect.cpp b/zirgen/Dialect/ZHLT/IR/Dialect.cpp
index 8c8f15c3..f2a6c531 100644
--- a/zirgen/Dialect/ZHLT/IR/Dialect.cpp
+++ b/zirgen/Dialect/ZHLT/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/ZHLT.h"
 #include "zirgen/Dialect/ZStruct/IR/ZStruct.h"
diff --git a/zirgen/Dialect/ZHLT/IR/Dialect.td b/zirgen/Dialect/ZHLT/IR/Dialect.td
index 14dcdee2..a231f32e 100644
--- a/zirgen/Dialect/ZHLT/IR/Dialect.td
+++ b/zirgen/Dialect/ZHLT/IR/Dialect.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef ZHLT_DIALECT
 #define ZHLT_DIALECT
diff --git a/zirgen/Dialect/ZHLT/IR/NamedVariadic.td b/zirgen/Dialect/ZHLT/IR/NamedVariadic.td
index 1d34967c..c19c8068 100644
--- a/zirgen/Dialect/ZHLT/IR/NamedVariadic.td
+++ b/zirgen/Dialect/ZHLT/IR/NamedVariadic.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/Constraints.td"
 
diff --git a/zirgen/Dialect/ZHLT/IR/Ops.cpp b/zirgen/Dialect/ZHLT/IR/Ops.cpp
index 339adef5..e67865ef 100644
--- a/zirgen/Dialect/ZHLT/IR/Ops.cpp
+++ b/zirgen/Dialect/ZHLT/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/TypeUtils.h"
 #include "zirgen/Dialect/ZHLT/IR/ZHLT.h"
diff --git a/zirgen/Dialect/ZHLT/IR/Ops.td b/zirgen/Dialect/ZHLT/IR/Ops.td
index b50f4443..4dde7bd5 100644
--- a/zirgen/Dialect/ZHLT/IR/Ops.td
+++ b/zirgen/Dialect/ZHLT/IR/Ops.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "mlir/Interfaces/FunctionInterfaces.td"
diff --git a/zirgen/Dialect/ZHLT/IR/TypeUtils.cpp b/zirgen/Dialect/ZHLT/IR/TypeUtils.cpp
index da749122..7c1f4c7b 100644
--- a/zirgen/Dialect/ZHLT/IR/TypeUtils.cpp
+++ b/zirgen/Dialect/ZHLT/IR/TypeUtils.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/TypeUtils.h"
 #include "zirgen/Dialect/ZStruct/IR/ZStruct.h"
diff --git a/zirgen/Dialect/ZHLT/IR/TypeUtils.h b/zirgen/Dialect/ZHLT/IR/TypeUtils.h
index 40e493c9..74776f76 100644
--- a/zirgen/Dialect/ZHLT/IR/TypeUtils.h
+++ b/zirgen/Dialect/ZHLT/IR/TypeUtils.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZHLT/IR/Types.td b/zirgen/Dialect/ZHLT/IR/Types.td
index 81490918..887dfdc3 100644
--- a/zirgen/Dialect/ZHLT/IR/Types.td
+++ b/zirgen/Dialect/ZHLT/IR/Types.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/ZHLT/IR/Dialect.td"
 include "zirgen/Dialect/Zll/IR/Interfaces.td"
diff --git a/zirgen/Dialect/ZHLT/IR/ZHLT.h b/zirgen/Dialect/ZHLT/IR/ZHLT.h
index f6465358..77e7c6b4 100644
--- a/zirgen/Dialect/ZHLT/IR/ZHLT.h
+++ b/zirgen/Dialect/ZHLT/IR/ZHLT.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZHLT/Transforms/GenerateSteps.cpp b/zirgen/Dialect/ZHLT/Transforms/GenerateSteps.cpp
index 044115be..169a9659 100644
--- a/zirgen/Dialect/ZHLT/Transforms/GenerateSteps.cpp
+++ b/zirgen/Dialect/ZHLT/Transforms/GenerateSteps.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "llvm/ADT/DenseSet.h"
diff --git a/zirgen/Dialect/ZHLT/Transforms/HoistAllocs.cpp b/zirgen/Dialect/ZHLT/Transforms/HoistAllocs.cpp
index a349ae86..81823166 100644
--- a/zirgen/Dialect/ZHLT/Transforms/HoistAllocs.cpp
+++ b/zirgen/Dialect/ZHLT/Transforms/HoistAllocs.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/PatternMatch.h"
diff --git a/zirgen/Dialect/ZHLT/Transforms/PassDetail.h b/zirgen/Dialect/ZHLT/Transforms/PassDetail.h
index 47544dac..934faab0 100644
--- a/zirgen/Dialect/ZHLT/Transforms/PassDetail.h
+++ b/zirgen/Dialect/ZHLT/Transforms/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZHLT/Transforms/Passes.h b/zirgen/Dialect/ZHLT/Transforms/Passes.h
index 16938fe5..6a08e321 100644
--- a/zirgen/Dialect/ZHLT/Transforms/Passes.h
+++ b/zirgen/Dialect/ZHLT/Transforms/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZHLT/Transforms/Passes.td b/zirgen/Dialect/ZHLT/Transforms/Passes.td
index 6e0631e6..482eff5c 100644
--- a/zirgen/Dialect/ZHLT/Transforms/Passes.td
+++ b/zirgen/Dialect/ZHLT/Transforms/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef ZHLT_TRANSFORM_PASSES
 #define ZHLT_TRANSFORM_PASSES
 
diff --git a/zirgen/Dialect/ZHLT/Transforms/StripTests.cpp b/zirgen/Dialect/ZHLT/Transforms/StripTests.cpp
index fa4fbac5..be63b37d 100644
--- a/zirgen/Dialect/ZHLT/Transforms/StripTests.cpp
+++ b/zirgen/Dialect/ZHLT/Transforms/StripTests.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "llvm/ADT/DenseSet.h"
 
diff --git a/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.cpp b/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.cpp
index 7861bd7a..088bdf25 100644
--- a/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.cpp
+++ b/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Analyses what buffers are used by a module.
 
diff --git a/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.h b/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.h
index a1bbcb05..1f136c04 100644
--- a/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.h
+++ b/zirgen/Dialect/ZStruct/Analysis/BufferAnalysis.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Analyses what buffers are used by a module.
 
diff --git a/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.cpp b/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.cpp
index 2dbef8de..51b6ec85 100644
--- a/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.cpp
+++ b/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.h"
 
diff --git a/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.h b/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.h
index 5b29a558..09f9b669 100644
--- a/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.h
+++ b/zirgen/Dialect/ZStruct/Analysis/DegreeAnalysis.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZStruct/IR/ZStruct.h"
 #include "zirgen/Dialect/Zll/Analysis/DegreeAnalysis.h"
diff --git a/zirgen/Dialect/ZStruct/IR/Attrs.cpp b/zirgen/Dialect/ZStruct/IR/Attrs.cpp
index 4cfada58..7ee585c4 100644
--- a/zirgen/Dialect/ZStruct/IR/Attrs.cpp
+++ b/zirgen/Dialect/ZStruct/IR/Attrs.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "llvm/ADT/TypeSwitch.h"
 
diff --git a/zirgen/Dialect/ZStruct/IR/Attrs.h b/zirgen/Dialect/ZStruct/IR/Attrs.h
index e4f85c25..dc19a2e1 100644
--- a/zirgen/Dialect/ZStruct/IR/Attrs.h
+++ b/zirgen/Dialect/ZStruct/IR/Attrs.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Attributes.h"
 
diff --git a/zirgen/Dialect/ZStruct/IR/Attrs.td b/zirgen/Dialect/ZStruct/IR/Attrs.td
index 4c0eccda..651365ed 100644
--- a/zirgen/Dialect/ZStruct/IR/Attrs.td
+++ b/zirgen/Dialect/ZStruct/IR/Attrs.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/AttrTypeBase.td"
 include "mlir/IR/OpBase.td"
 include "mlir/IR/BuiltinAttributeInterfaces.td"
diff --git a/zirgen/Dialect/ZStruct/IR/Dialect.cpp b/zirgen/Dialect/ZStruct/IR/Dialect.cpp
index 167f143f..e9151130 100644
--- a/zirgen/Dialect/ZStruct/IR/Dialect.cpp
+++ b/zirgen/Dialect/ZStruct/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZStruct/IR/ZStruct.h"
 
diff --git a/zirgen/Dialect/ZStruct/IR/Dialect.td b/zirgen/Dialect/ZStruct/IR/Dialect.td
index 40275360..5a2f8f94 100644
--- a/zirgen/Dialect/ZStruct/IR/Dialect.td
+++ b/zirgen/Dialect/ZStruct/IR/Dialect.td
@@ -1,6 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #ifndef ZSTRUCT_DIALECT
 #define ZSTRUCT_DIALECT
diff --git a/zirgen/Dialect/ZStruct/IR/Enums.td b/zirgen/Dialect/ZStruct/IR/Enums.td
index 2707f670..5ba658ee 100644
--- a/zirgen/Dialect/ZStruct/IR/Enums.td
+++ b/zirgen/Dialect/ZStruct/IR/Enums.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/EnumAttr.td"
 
 def LayoutKind : I32EnumAttr<"LayoutKind", "Layout Kind", [
diff --git a/zirgen/Dialect/ZStruct/IR/Interfaces.td b/zirgen/Dialect/ZStruct/IR/Interfaces.td
index 5b2d398e..b78bd48f 100644
--- a/zirgen/Dialect/ZStruct/IR/Interfaces.td
+++ b/zirgen/Dialect/ZStruct/IR/Interfaces.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/OpBase.td"
 
 #ifndef ZSTRUCT_INTERFACES
diff --git a/zirgen/Dialect/ZStruct/IR/Ops.cpp b/zirgen/Dialect/ZStruct/IR/Ops.cpp
index 670c2d5a..57e5af70 100644
--- a/zirgen/Dialect/ZStruct/IR/Ops.cpp
+++ b/zirgen/Dialect/ZStruct/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Matchers.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
diff --git a/zirgen/Dialect/ZStruct/IR/Ops.td b/zirgen/Dialect/ZStruct/IR/Ops.td
index bce096f1..b2401100 100644
--- a/zirgen/Dialect/ZStruct/IR/Ops.td
+++ b/zirgen/Dialect/ZStruct/IR/Ops.td
@@ -1,6 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "mlir/Interfaces/ControlFlowInterfaces.td"
diff --git a/zirgen/Dialect/ZStruct/IR/TypeUtils.cpp b/zirgen/Dialect/ZStruct/IR/TypeUtils.cpp
index eb2b8bf6..c591290c 100644
--- a/zirgen/Dialect/ZStruct/IR/TypeUtils.cpp
+++ b/zirgen/Dialect/ZStruct/IR/TypeUtils.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZStruct/IR/TypeUtils.h"
 
diff --git a/zirgen/Dialect/ZStruct/IR/TypeUtils.h b/zirgen/Dialect/ZStruct/IR/TypeUtils.h
index b24b390c..da18e7b1 100644
--- a/zirgen/Dialect/ZStruct/IR/TypeUtils.h
+++ b/zirgen/Dialect/ZStruct/IR/TypeUtils.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZStruct/IR/ZStruct.h"
 
diff --git a/zirgen/Dialect/ZStruct/IR/Types.cpp b/zirgen/Dialect/ZStruct/IR/Types.cpp
index 547174e7..55aa552f 100644
--- a/zirgen/Dialect/ZStruct/IR/Types.cpp
+++ b/zirgen/Dialect/ZStruct/IR/Types.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "llvm/ADT/TypeSwitch.h"
 
diff --git a/zirgen/Dialect/ZStruct/IR/Types.h b/zirgen/Dialect/ZStruct/IR/Types.h
index 442eb444..12b91c7f 100644
--- a/zirgen/Dialect/ZStruct/IR/Types.h
+++ b/zirgen/Dialect/ZStruct/IR/Types.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZStruct/IR/Types.td b/zirgen/Dialect/ZStruct/IR/Types.td
index 761a2cd2..90f7e52d 100644
--- a/zirgen/Dialect/ZStruct/IR/Types.td
+++ b/zirgen/Dialect/ZStruct/IR/Types.td
@@ -1,6 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/Zll/IR/Types.td"
diff --git a/zirgen/Dialect/ZStruct/IR/ZStruct.h b/zirgen/Dialect/ZStruct/IR/ZStruct.h
index 4e241f99..7424f07a 100644
--- a/zirgen/Dialect/ZStruct/IR/ZStruct.h
+++ b/zirgen/Dialect/ZStruct/IR/ZStruct.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZStruct/Transforms/ExpandLayout.cpp b/zirgen/Dialect/ZStruct/Transforms/ExpandLayout.cpp
index 6ccce816..5351741b 100644
--- a/zirgen/Dialect/ZStruct/Transforms/ExpandLayout.cpp
+++ b/zirgen/Dialect/ZStruct/Transforms/ExpandLayout.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/ZStruct/Transforms/InlineLayout.cpp b/zirgen/Dialect/ZStruct/Transforms/InlineLayout.cpp
index 1f616a43..7cc9f6ac 100644
--- a/zirgen/Dialect/ZStruct/Transforms/InlineLayout.cpp
+++ b/zirgen/Dialect/ZStruct/Transforms/InlineLayout.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/ZStruct/Transforms/OptimizeLayout.cpp b/zirgen/Dialect/ZStruct/Transforms/OptimizeLayout.cpp
index 67a61cc8..f80f0603 100644
--- a/zirgen/Dialect/ZStruct/Transforms/OptimizeLayout.cpp
+++ b/zirgen/Dialect/ZStruct/Transforms/OptimizeLayout.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinDialect.h"
 #include "mlir/IR/BuiltinOps.h"
diff --git a/zirgen/Dialect/ZStruct/Transforms/PassDetail.h b/zirgen/Dialect/ZStruct/Transforms/PassDetail.h
index 21cb10e8..4ede888c 100644
--- a/zirgen/Dialect/ZStruct/Transforms/PassDetail.h
+++ b/zirgen/Dialect/ZStruct/Transforms/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZStruct/Transforms/Passes.h b/zirgen/Dialect/ZStruct/Transforms/Passes.h
index 50092055..55f5a688 100644
--- a/zirgen/Dialect/ZStruct/Transforms/Passes.h
+++ b/zirgen/Dialect/ZStruct/Transforms/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/ZStruct/Transforms/Passes.td b/zirgen/Dialect/ZStruct/Transforms/Passes.td
index f2dbde6f..de9b6d51 100644
--- a/zirgen/Dialect/ZStruct/Transforms/Passes.td
+++ b/zirgen/Dialect/ZStruct/Transforms/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef ZSTRUCT_TRANSFORM_PASSES
 #define ZSTRUCT_TRANSFORM_PASSES
 
diff --git a/zirgen/Dialect/ZStruct/Transforms/StripAliasLayoutOps.cpp b/zirgen/Dialect/ZStruct/Transforms/StripAliasLayoutOps.cpp
index de6d8429..dec9ade9 100644
--- a/zirgen/Dialect/ZStruct/Transforms/StripAliasLayoutOps.cpp
+++ b/zirgen/Dialect/ZStruct/Transforms/StripAliasLayoutOps.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinDialect.h"
 #include "mlir/IR/BuiltinOps.h"
diff --git a/zirgen/Dialect/ZStruct/Transforms/Unroll.cpp b/zirgen/Dialect/ZStruct/Transforms/Unroll.cpp
index d60d910c..23f1646f 100644
--- a/zirgen/Dialect/ZStruct/Transforms/Unroll.cpp
+++ b/zirgen/Dialect/ZStruct/Transforms/Unroll.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.cpp b/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.cpp
index f1de2bed..be55e371 100644
--- a/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.cpp
+++ b/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/Analysis/DegreeAnalysis.h"
 
diff --git a/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.h b/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.h
index 8d53cd2d..a6a904d6 100644
--- a/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.h
+++ b/zirgen/Dialect/Zll/Analysis/DegreeAnalysis.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Analysis/DataFlow/SparseAnalysis.h"
 #include "zirgen/Dialect/Zll/IR/IR.h"
diff --git a/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.cpp b/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.cpp
index 5388d32e..5c29da66 100644
--- a/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.cpp
+++ b/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.h"
 #include "llvm/ADT/TypeSwitch.h"
diff --git a/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.h b/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.h
index e9dc5e76..4456dc84 100644
--- a/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.h
+++ b/zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Operation.h"
 #include "zirgen/Dialect/Zll/IR/IR.h"
diff --git a/zirgen/Dialect/Zll/Analysis/TapsAnalysis.cpp b/zirgen/Dialect/Zll/Analysis/TapsAnalysis.cpp
index bb87a8da..ab7c9553 100644
--- a/zirgen/Dialect/Zll/Analysis/TapsAnalysis.cpp
+++ b/zirgen/Dialect/Zll/Analysis/TapsAnalysis.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/Analysis/TapsAnalysis.h"
 
diff --git a/zirgen/Dialect/Zll/Analysis/TapsAnalysis.h b/zirgen/Dialect/Zll/Analysis/TapsAnalysis.h
index 459ab107..52f05a01 100644
--- a/zirgen/Dialect/Zll/Analysis/TapsAnalysis.h
+++ b/zirgen/Dialect/Zll/Analysis/TapsAnalysis.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/Conversion/ZStructToZll/LowerComposites.cpp b/zirgen/Dialect/Zll/Conversion/ZStructToZll/LowerComposites.cpp
index e3cc260e..42759e62 100644
--- a/zirgen/Dialect/Zll/Conversion/ZStructToZll/LowerComposites.cpp
+++ b/zirgen/Dialect/Zll/Conversion/ZStructToZll/LowerComposites.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/PatternMatch.h"
diff --git a/zirgen/Dialect/Zll/Conversion/ZStructToZll/PassDetail.h b/zirgen/Dialect/Zll/Conversion/ZStructToZll/PassDetail.h
index 4dfbd73f..55879319 100644
--- a/zirgen/Dialect/Zll/Conversion/ZStructToZll/PassDetail.h
+++ b/zirgen/Dialect/Zll/Conversion/ZStructToZll/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.h b/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.h
index 2d197071..4b404a1a 100644
--- a/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.h
+++ b/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.td b/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.td
index 50d92a23..f75a0ba7 100644
--- a/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.td
+++ b/zirgen/Dialect/Zll/Conversion/ZStructToZll/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef ZLL_CONVERSION_PASSES
 #define ZLL_CONVERSION_PASSES
 
diff --git a/zirgen/Dialect/Zll/IR/Attrs.cpp b/zirgen/Dialect/Zll/IR/Attrs.cpp
index 3e65bc62..52b58bfb 100644
--- a/zirgen/Dialect/Zll/IR/Attrs.cpp
+++ b/zirgen/Dialect/Zll/IR/Attrs.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/Attrs.h"
 #include "zirgen/Dialect/Zll/IR/IR.h"
diff --git a/zirgen/Dialect/Zll/IR/Attrs.h b/zirgen/Dialect/Zll/IR/Attrs.h
index f68f37d4..46daeaee 100644
--- a/zirgen/Dialect/Zll/IR/Attrs.h
+++ b/zirgen/Dialect/Zll/IR/Attrs.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/IR/Attrs.td b/zirgen/Dialect/Zll/IR/Attrs.td
index 08db6271..9d49d0c0 100644
--- a/zirgen/Dialect/Zll/IR/Attrs.td
+++ b/zirgen/Dialect/Zll/IR/Attrs.td
@@ -1,6 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #ifndef ZIRGEN_IR_ATTRS
 #define ZIRGEN_IR_ATTRS
diff --git a/zirgen/Dialect/Zll/IR/BigInt.h b/zirgen/Dialect/Zll/IR/BigInt.h
index 8f99d3b1..08e1a51e 100644
--- a/zirgen/Dialect/Zll/IR/BigInt.h
+++ b/zirgen/Dialect/Zll/IR/BigInt.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/baby_bear.h"
 #include "llvm/ADT/APInt.h"
diff --git a/zirgen/Dialect/Zll/IR/Codegen.h b/zirgen/Dialect/Zll/IR/Codegen.h
index c072e445..850a651e 100644
--- a/zirgen/Dialect/Zll/IR/Codegen.h
+++ b/zirgen/Dialect/Zll/IR/Codegen.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/IR/CodegenEmitter.cpp b/zirgen/Dialect/Zll/IR/CodegenEmitter.cpp
index 29d313e0..2d461539 100644
--- a/zirgen/Dialect/Zll/IR/CodegenEmitter.cpp
+++ b/zirgen/Dialect/Zll/IR/CodegenEmitter.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cassert>
 
diff --git a/zirgen/Dialect/Zll/IR/Dialect.cpp b/zirgen/Dialect/Zll/IR/Dialect.cpp
index aeb27c7c..0ebab512 100644
--- a/zirgen/Dialect/Zll/IR/Dialect.cpp
+++ b/zirgen/Dialect/Zll/IR/Dialect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/IR.h"
 
diff --git a/zirgen/Dialect/Zll/IR/Dialect.td b/zirgen/Dialect/Zll/IR/Dialect.td
index 84c3a19f..77ab3b45 100644
--- a/zirgen/Dialect/Zll/IR/Dialect.td
+++ b/zirgen/Dialect/Zll/IR/Dialect.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef ZLL_DIALECT
 #define ZLL_DIALECT
diff --git a/zirgen/Dialect/Zll/IR/Enums.td b/zirgen/Dialect/Zll/IR/Enums.td
index 2135f5f7..52de7031 100644
--- a/zirgen/Dialect/Zll/IR/Enums.td
+++ b/zirgen/Dialect/Zll/IR/Enums.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/EnumAttr.td"
 
 def BufferKind : I32EnumAttr<"BufferKind", "Buffer Type", [
diff --git a/zirgen/Dialect/Zll/IR/Field.cpp b/zirgen/Dialect/Zll/IR/Field.cpp
index 4722ba1a..21c8e9b1 100644
--- a/zirgen/Dialect/Zll/IR/Field.cpp
+++ b/zirgen/Dialect/Zll/IR/Field.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/Field.h"
 #include "zirgen/Dialect/Zll/IR/IR.h"
diff --git a/zirgen/Dialect/Zll/IR/Field.h b/zirgen/Dialect/Zll/IR/Field.h
index b7106b53..8366cc01 100644
--- a/zirgen/Dialect/Zll/IR/Field.h
+++ b/zirgen/Dialect/Zll/IR/Field.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/IR/IR.cpp b/zirgen/Dialect/Zll/IR/IR.cpp
index 8bf5899e..6e86d552 100644
--- a/zirgen/Dialect/Zll/IR/IR.cpp
+++ b/zirgen/Dialect/Zll/IR/IR.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "llvm/Support/FormatVariadic.h"
 
diff --git a/zirgen/Dialect/Zll/IR/IR.h b/zirgen/Dialect/Zll/IR/IR.h
index 21a4e4c9..da872b91 100644
--- a/zirgen/Dialect/Zll/IR/IR.h
+++ b/zirgen/Dialect/Zll/IR/IR.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/IR/Interfaces.td b/zirgen/Dialect/Zll/IR/Interfaces.td
index fccc9e5b..8065f913 100644
--- a/zirgen/Dialect/Zll/IR/Interfaces.td
+++ b/zirgen/Dialect/Zll/IR/Interfaces.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 include "mlir/IR/OpBase.td"
 include "mlir/IR/SymbolInterfaces.td"
 
diff --git a/zirgen/Dialect/Zll/IR/Interpreter.cpp b/zirgen/Dialect/Zll/IR/Interpreter.cpp
index e6699b14..f812441d 100644
--- a/zirgen/Dialect/Zll/IR/Interpreter.cpp
+++ b/zirgen/Dialect/Zll/IR/Interpreter.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/Interpreter.h"
 #include "llvm/ADT/TypeSwitch.h"
diff --git a/zirgen/Dialect/Zll/IR/Interpreter.h b/zirgen/Dialect/Zll/IR/Interpreter.h
index d495ba07..70c5688c 100644
--- a/zirgen/Dialect/Zll/IR/Interpreter.h
+++ b/zirgen/Dialect/Zll/IR/Interpreter.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/IR/Ops.cpp b/zirgen/Dialect/Zll/IR/Ops.cpp
index 1c37d813..67ef26f4 100644
--- a/zirgen/Dialect/Zll/IR/Ops.cpp
+++ b/zirgen/Dialect/Zll/IR/Ops.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/IR.h"
 
diff --git a/zirgen/Dialect/Zll/IR/Ops.td b/zirgen/Dialect/Zll/IR/Ops.td
index b49ad01d..9051fd05 100644
--- a/zirgen/Dialect/Zll/IR/Ops.td
+++ b/zirgen/Dialect/Zll/IR/Ops.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/OpBase.td"
 include "mlir/Interfaces/ControlFlowInterfaces.td"
diff --git a/zirgen/Dialect/Zll/IR/Types.cpp b/zirgen/Dialect/Zll/IR/Types.cpp
index 0f08edb3..870e7eef 100644
--- a/zirgen/Dialect/Zll/IR/Types.cpp
+++ b/zirgen/Dialect/Zll/IR/Types.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/Types.h"
 #include "zirgen/Dialect/Zll/IR/IR.h"
diff --git a/zirgen/Dialect/Zll/IR/Types.h b/zirgen/Dialect/Zll/IR/Types.h
index 98643e66..7c79a705 100644
--- a/zirgen/Dialect/Zll/IR/Types.h
+++ b/zirgen/Dialect/Zll/IR/Types.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/IR/Types.td b/zirgen/Dialect/Zll/IR/Types.td
index 192f0491..687a9bc8 100644
--- a/zirgen/Dialect/Zll/IR/Types.td
+++ b/zirgen/Dialect/Zll/IR/Types.td
@@ -1,4 +1,16 @@
-// Copyright (c) 2023 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 include "mlir/IR/AttrTypeBase.td"
 include "zirgen/Dialect/Zll/IR/Dialect.td"
diff --git a/zirgen/Dialect/Zll/Transforms/AddReductions.cpp b/zirgen/Dialect/Zll/Transforms/AddReductions.cpp
index c3f320ac..ea652f82 100644
--- a/zirgen/Dialect/Zll/Transforms/AddReductions.cpp
+++ b/zirgen/Dialect/Zll/Transforms/AddReductions.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "llvm/ADT/APSInt.h"
diff --git a/zirgen/Dialect/Zll/Transforms/ComputeTaps.cpp b/zirgen/Dialect/Zll/Transforms/ComputeTaps.cpp
index e73913a8..746654a9 100644
--- a/zirgen/Dialect/Zll/Transforms/ComputeTaps.cpp
+++ b/zirgen/Dialect/Zll/Transforms/ComputeTaps.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <set>
 #include <tuple>
diff --git a/zirgen/Dialect/Zll/Transforms/DropConstraints.cpp b/zirgen/Dialect/Zll/Transforms/DropConstraints.cpp
index 2683e969..fa3632ec 100644
--- a/zirgen/Dialect/Zll/Transforms/DropConstraints.cpp
+++ b/zirgen/Dialect/Zll/Transforms/DropConstraints.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/Zll/Transforms/InlineFpExt.cpp b/zirgen/Dialect/Zll/Transforms/InlineFpExt.cpp
index 446cfe96..7e76c6d2 100644
--- a/zirgen/Dialect/Zll/Transforms/InlineFpExt.cpp
+++ b/zirgen/Dialect/Zll/Transforms/InlineFpExt.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/Zll/Transforms/MakePolynomial.cpp b/zirgen/Dialect/Zll/Transforms/MakePolynomial.cpp
index d9aa6189..2987a3d4 100644
--- a/zirgen/Dialect/Zll/Transforms/MakePolynomial.cpp
+++ b/zirgen/Dialect/Zll/Transforms/MakePolynomial.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Dialect/Zll/Transforms/MakeVerifyTaps.cpp b/zirgen/Dialect/Zll/Transforms/MakeVerifyTaps.cpp
index 286a7e12..95f3bc39 100644
--- a/zirgen/Dialect/Zll/Transforms/MakeVerifyTaps.cpp
+++ b/zirgen/Dialect/Zll/Transforms/MakeVerifyTaps.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cassert>
 
diff --git a/zirgen/Dialect/Zll/Transforms/PassDetail.h b/zirgen/Dialect/Zll/Transforms/PassDetail.h
index 9c0dd054..4afe72ac 100644
--- a/zirgen/Dialect/Zll/Transforms/PassDetail.h
+++ b/zirgen/Dialect/Zll/Transforms/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/Transforms/Passes.h b/zirgen/Dialect/Zll/Transforms/Passes.h
index f1035591..9e79c236 100644
--- a/zirgen/Dialect/Zll/Transforms/Passes.h
+++ b/zirgen/Dialect/Zll/Transforms/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/Dialect/Zll/Transforms/Passes.td b/zirgen/Dialect/Zll/Transforms/Passes.td
index b06b073e..51a6b7e4 100644
--- a/zirgen/Dialect/Zll/Transforms/Passes.td
+++ b/zirgen/Dialect/Zll/Transforms/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef ZLL_TRANSFORM_PASSES
 #define ZLL_TRANSFORM_PASSES
 
diff --git a/zirgen/Dialect/Zll/Transforms/SplitStage.cpp b/zirgen/Dialect/Zll/Transforms/SplitStage.cpp
index 6df59c38..388836f1 100644
--- a/zirgen/Dialect/Zll/Transforms/SplitStage.cpp
+++ b/zirgen/Dialect/Zll/Transforms/SplitStage.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/Utilities/DataFlow.h b/zirgen/Utilities/DataFlow.h
index 010822a6..7c7ceab7 100644
--- a/zirgen/Utilities/DataFlow.h
+++ b/zirgen/Utilities/DataFlow.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/bootstrap/src/main.rs b/zirgen/bootstrap/src/main.rs
index 3608d685..ddcb0b98 100644
--- a/zirgen/bootstrap/src/main.rs
+++ b/zirgen/bootstrap/src/main.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use std::{
     collections::BTreeMap,
diff --git a/zirgen/circuit/bigint/gen_bigint.cpp b/zirgen/circuit/bigint/gen_bigint.cpp
index d3fa07c5..4afb8156 100644
--- a/zirgen/circuit/bigint/gen_bigint.cpp
+++ b/zirgen/circuit/bigint/gen_bigint.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Transforms/Passes.h"
 #include "zirgen/Dialect/BigInt/IR/BigInt.h"
diff --git a/zirgen/circuit/bigint/op_tests.cpp b/zirgen/circuit/bigint/op_tests.cpp
index 04191baf..73ce7465 100644
--- a/zirgen/circuit/bigint/op_tests.cpp
+++ b/zirgen/circuit/bigint/op_tests.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/bigint/op_tests.h"
 
diff --git a/zirgen/circuit/bigint/op_tests.h b/zirgen/circuit/bigint/op_tests.h
index 88ce8153..e8c1fcb2 100644
--- a/zirgen/circuit/bigint/op_tests.h
+++ b/zirgen/circuit/bigint/op_tests.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <memory>
 
diff --git a/zirgen/circuit/bigint/rsa.cpp b/zirgen/circuit/bigint/rsa.cpp
index 3f5ea377..986e3a7e 100644
--- a/zirgen/circuit/bigint/rsa.cpp
+++ b/zirgen/circuit/bigint/rsa.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/bigint/rsa.h"
 #include "zirgen/Dialect/BigInt/IR/BigInt.h"
diff --git a/zirgen/circuit/bigint/rsa.h b/zirgen/circuit/bigint/rsa.h
index d5d74cb4..fd33531e 100644
--- a/zirgen/circuit/bigint/rsa.h
+++ b/zirgen/circuit/bigint/rsa.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Location.h"
diff --git a/zirgen/circuit/fib/build.rs b/zirgen/circuit/fib/build.rs
index 5172b646..9bf3d806 100644
--- a/zirgen/circuit/fib/build.rs
+++ b/zirgen/circuit/fib/build.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use std::path::PathBuf;
 
diff --git a/zirgen/circuit/fib/cxx/ffi.cpp b/zirgen/circuit/fib/cxx/ffi.cpp
index 22151e57..c938382a 100644
--- a/zirgen/circuit/fib/cxx/ffi.cpp
+++ b/zirgen/circuit/fib/cxx/ffi.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "ffi.h"
 #include "fp.h"
diff --git a/zirgen/circuit/fib/cxx/ffi.h b/zirgen/circuit/fib/cxx/ffi.h
index 04d37077..f05c7826 100644
--- a/zirgen/circuit/fib/cxx/ffi.h
+++ b/zirgen/circuit/fib/cxx/ffi.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/fib/cxx/fp.h b/zirgen/circuit/fib/cxx/fp.h
index 5824a818..fd962f17 100644
--- a/zirgen/circuit/fib/cxx/fp.h
+++ b/zirgen/circuit/fib/cxx/fp.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/fib/cxx/fpext.h b/zirgen/circuit/fib/cxx/fpext.h
index 0b41f69d..e340b980 100644
--- a/zirgen/circuit/fib/cxx/fpext.h
+++ b/zirgen/circuit/fib/cxx/fpext.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/fib/fib.cpp b/zirgen/circuit/fib/fib.cpp
index ea19bef0..81d1e6f2 100644
--- a/zirgen/circuit/fib/fib.cpp
+++ b/zirgen/circuit/fib/fib.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/codegen/codegen.h"
 #include "zirgen/compiler/codegen/protocol_info_const.h"
diff --git a/zirgen/circuit/fib/src/cpp.rs b/zirgen/circuit/fib/src/cpp.rs
index c238ae4b..a00e57bb 100644
--- a/zirgen/circuit/fib/src/cpp.rs
+++ b/zirgen/circuit/fib/src/cpp.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use anyhow::Result;
 use risc0_zkp::{
diff --git a/zirgen/circuit/fib/src/ffi.rs b/zirgen/circuit/fib/src/ffi.rs
index cbbebe04..41d3b91e 100644
--- a/zirgen/circuit/fib/src/ffi.rs
+++ b/zirgen/circuit/fib/src/ffi.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use std::{
     ffi::CStr,
diff --git a/zirgen/circuit/fib/src/lib.rs b/zirgen/circuit/fib/src/lib.rs
index c85c7741..3341001c 100644
--- a/zirgen/circuit/fib/src/lib.rs
+++ b/zirgen/circuit/fib/src/lib.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 mod cpp;
 mod ffi;
diff --git a/zirgen/circuit/predicates/gen_predicates.cpp b/zirgen/circuit/predicates/gen_predicates.cpp
index 4d900fa4..130bb7c7 100644
--- a/zirgen/circuit/predicates/gen_predicates.cpp
+++ b/zirgen/circuit/predicates/gen_predicates.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/predicates/predicates.h"
 #include "zirgen/circuit/recursion/code.h"
diff --git a/zirgen/circuit/predicates/predicates.cpp b/zirgen/circuit/predicates/predicates.cpp
index ef49c745..a36b022f 100644
--- a/zirgen/circuit/predicates/predicates.cpp
+++ b/zirgen/circuit/predicates/predicates.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/predicates/predicates.h"
 
diff --git a/zirgen/circuit/predicates/predicates.h b/zirgen/circuit/predicates/predicates.h
index 4d124fd8..8df7501e 100644
--- a/zirgen/circuit/predicates/predicates.h
+++ b/zirgen/circuit/predicates/predicates.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/bits.cpp b/zirgen/circuit/recursion/bits.cpp
index 563261b4..8d40eb23 100644
--- a/zirgen/circuit/recursion/bits.cpp
+++ b/zirgen/circuit/recursion/bits.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/bits.h"
 
diff --git a/zirgen/circuit/recursion/bits.h b/zirgen/circuit/recursion/bits.h
index ef5cbae1..66b4f69e 100644
--- a/zirgen/circuit/recursion/bits.h
+++ b/zirgen/circuit/recursion/bits.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/checked_bytes.cpp b/zirgen/circuit/recursion/checked_bytes.cpp
index 56279c96..c9b36bea 100644
--- a/zirgen/circuit/recursion/checked_bytes.cpp
+++ b/zirgen/circuit/recursion/checked_bytes.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/checked_bytes.h"
 
diff --git a/zirgen/circuit/recursion/checked_bytes.h b/zirgen/circuit/recursion/checked_bytes.h
index fdf8c977..95b2a5ec 100644
--- a/zirgen/circuit/recursion/checked_bytes.h
+++ b/zirgen/circuit/recursion/checked_bytes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/code.cpp b/zirgen/circuit/recursion/code.cpp
index 2e18c148..d4aaedad 100644
--- a/zirgen/circuit/recursion/code.cpp
+++ b/zirgen/circuit/recursion/code.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/code.h"
 
diff --git a/zirgen/circuit/recursion/code.h b/zirgen/circuit/recursion/code.h
index 0105f69b..b75c8345 100644
--- a/zirgen/circuit/recursion/code.h
+++ b/zirgen/circuit/recursion/code.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/encode.cpp b/zirgen/circuit/recursion/encode.cpp
index bf1ed889..c88a0f71 100644
--- a/zirgen/circuit/recursion/encode.cpp
+++ b/zirgen/circuit/recursion/encode.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/encode.h"
 
diff --git a/zirgen/circuit/recursion/encode.h b/zirgen/circuit/recursion/encode.h
index 6bef1596..1f5bb217 100644
--- a/zirgen/circuit/recursion/encode.h
+++ b/zirgen/circuit/recursion/encode.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/macro.cpp b/zirgen/circuit/recursion/macro.cpp
index a4a523d2..bc79cdee 100644
--- a/zirgen/circuit/recursion/macro.cpp
+++ b/zirgen/circuit/recursion/macro.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/macro.h"
 
diff --git a/zirgen/circuit/recursion/macro.h b/zirgen/circuit/recursion/macro.h
index b6842110..a2b0958d 100644
--- a/zirgen/circuit/recursion/macro.h
+++ b/zirgen/circuit/recursion/macro.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/micro.cpp b/zirgen/circuit/recursion/micro.cpp
index 29ee10eb..e07ef906 100644
--- a/zirgen/circuit/recursion/micro.cpp
+++ b/zirgen/circuit/recursion/micro.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/micro.h"
 
diff --git a/zirgen/circuit/recursion/micro.h b/zirgen/circuit/recursion/micro.h
index c8d54902..bcf54356 100644
--- a/zirgen/circuit/recursion/micro.h
+++ b/zirgen/circuit/recursion/micro.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/poseidon2.cpp b/zirgen/circuit/recursion/poseidon2.cpp
index ada75260..e00e5ec7 100644
--- a/zirgen/circuit/recursion/poseidon2.cpp
+++ b/zirgen/circuit/recursion/poseidon2.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/poseidon2.h"
 #include "zirgen/compiler/zkp/baby_bear.h"
diff --git a/zirgen/circuit/recursion/poseidon2.h b/zirgen/circuit/recursion/poseidon2.h
index bdbd53af..5ad4f68a 100644
--- a/zirgen/circuit/recursion/poseidon2.h
+++ b/zirgen/circuit/recursion/poseidon2.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/recursion.cpp b/zirgen/circuit/recursion/recursion.cpp
index de365bf9..4d2fb568 100644
--- a/zirgen/circuit/recursion/recursion.cpp
+++ b/zirgen/circuit/recursion/recursion.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/IR.h"
 #include "zirgen/Dialect/Zll/Transforms/Passes.h"
diff --git a/zirgen/circuit/recursion/sha.cpp b/zirgen/circuit/recursion/sha.cpp
index 05f9a804..43bbf2b8 100644
--- a/zirgen/circuit/recursion/sha.cpp
+++ b/zirgen/circuit/recursion/sha.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/sha.h"
 
diff --git a/zirgen/circuit/recursion/sha.h b/zirgen/circuit/recursion/sha.h
index 6de8f08f..d4f2141d 100644
--- a/zirgen/circuit/recursion/sha.h
+++ b/zirgen/circuit/recursion/sha.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/test/AB.cpp b/zirgen/circuit/recursion/test/AB.cpp
index 82514fbb..f572bde0 100644
--- a/zirgen/circuit/recursion/test/AB.cpp
+++ b/zirgen/circuit/recursion/test/AB.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // AB tests; runs the functions in both the emulator, and in the
 // recursion circuit in the emulator, and compares the results to make
diff --git a/zirgen/circuit/recursion/test/AB.h b/zirgen/circuit/recursion/test/AB.h
index 76ec8503..3e77334d 100644
--- a/zirgen/circuit/recursion/test/AB.h
+++ b/zirgen/circuit/recursion/test/AB.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/test/recurse.cpp b/zirgen/circuit/recursion/test/recurse.cpp
index 6cb73b50..61401daa 100644
--- a/zirgen/circuit/recursion/test/recurse.cpp
+++ b/zirgen/circuit/recursion/test/recurse.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/encode.h"
 #include "zirgen/circuit/recursion/test/AB.h"
diff --git a/zirgen/circuit/recursion/test/runner.cpp b/zirgen/circuit/recursion/test/runner.cpp
index 4538440f..eec657b6 100644
--- a/zirgen/circuit/recursion/test/runner.cpp
+++ b/zirgen/circuit/recursion/test/runner.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/test/runner.h"
 
diff --git a/zirgen/circuit/recursion/test/runner.h b/zirgen/circuit/recursion/test/runner.h
index 3f222063..1467527b 100644
--- a/zirgen/circuit/recursion/test/runner.h
+++ b/zirgen/circuit/recursion/test/runner.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/test/smoke.cpp b/zirgen/circuit/recursion/test/smoke.cpp
index 3b58d707..f9a3c8d1 100644
--- a/zirgen/circuit/recursion/test/smoke.cpp
+++ b/zirgen/circuit/recursion/test/smoke.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/encode.h"
 #include "zirgen/circuit/recursion/test/runner.h"
diff --git a/zirgen/circuit/recursion/top.cpp b/zirgen/circuit/recursion/top.cpp
index 67348f59..2106f27e 100644
--- a/zirgen/circuit/recursion/top.cpp
+++ b/zirgen/circuit/recursion/top.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/top.h"
 
diff --git a/zirgen/circuit/recursion/top.h b/zirgen/circuit/recursion/top.h
index ea8e6bc5..c06d3bf6 100644
--- a/zirgen/circuit/recursion/top.h
+++ b/zirgen/circuit/recursion/top.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/recursion/wom.cpp b/zirgen/circuit/recursion/wom.cpp
index bafd1584..8d567741 100644
--- a/zirgen/circuit/recursion/wom.cpp
+++ b/zirgen/circuit/recursion/wom.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/recursion/wom.h"
 
diff --git a/zirgen/circuit/recursion/wom.h b/zirgen/circuit/recursion/wom.h
index 07392af6..27697b36 100644
--- a/zirgen/circuit/recursion/wom.h
+++ b/zirgen/circuit/recursion/wom.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/shared/rv32im.h b/zirgen/circuit/rv32im/shared/rv32im.h
index 367bf7cb..838b6c19 100644
--- a/zirgen/circuit/rv32im/shared/rv32im.h
+++ b/zirgen/circuit/rv32im/shared/rv32im.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/shared/test/riscv_test.h b/zirgen/circuit/rv32im/shared/test/riscv_test.h
index ae270907..cc4ce031 100644
--- a/zirgen/circuit/rv32im/shared/test/riscv_test.h
+++ b/zirgen/circuit/rv32im/shared/test/riscv_test.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #define __riscv_xlen 32
 #define TESTNUM x31
diff --git a/zirgen/circuit/rv32im/shared/test/test.cpp b/zirgen/circuit/rv32im/shared/test/test.cpp
index 770fe4c2..24b2a637 100644
--- a/zirgen/circuit/rv32im/shared/test/test.cpp
+++ b/zirgen/circuit/rv32im/shared/test/test.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/edsl/bigint.cpp b/zirgen/circuit/rv32im/v1/edsl/bigint.cpp
index ea370f69..64fa18e2 100644
--- a/zirgen/circuit/rv32im/v1/edsl/bigint.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/bigint.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/compute.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/bigint.h b/zirgen/circuit/rv32im/v1/edsl/bigint.h
index 2210e115..8e85df73 100644
--- a/zirgen/circuit/rv32im/v1/edsl/bigint.h
+++ b/zirgen/circuit/rv32im/v1/edsl/bigint.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/body.cpp b/zirgen/circuit/rv32im/v1/edsl/body.cpp
index 60b37882..aa95c549 100644
--- a/zirgen/circuit/rv32im/v1/edsl/body.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/body.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/body.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/body.h b/zirgen/circuit/rv32im/v1/edsl/body.h
index b9b83226..48fa65af 100644
--- a/zirgen/circuit/rv32im/v1/edsl/body.h
+++ b/zirgen/circuit/rv32im/v1/edsl/body.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/code.cpp b/zirgen/circuit/rv32im/v1/edsl/code.cpp
index 505bb899..d563915e 100644
--- a/zirgen/circuit/rv32im/v1/edsl/code.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/code.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/code.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/code.h b/zirgen/circuit/rv32im/v1/edsl/code.h
index 48dbc729..e2644654 100644
--- a/zirgen/circuit/rv32im/v1/edsl/code.h
+++ b/zirgen/circuit/rv32im/v1/edsl/code.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/compute.cpp b/zirgen/circuit/rv32im/v1/edsl/compute.cpp
index a6abfdc9..3b5572be 100644
--- a/zirgen/circuit/rv32im/v1/edsl/compute.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/compute.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/compute.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/compute.h b/zirgen/circuit/rv32im/v1/edsl/compute.h
index 50ac444b..301a0344 100644
--- a/zirgen/circuit/rv32im/v1/edsl/compute.h
+++ b/zirgen/circuit/rv32im/v1/edsl/compute.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/decode.cpp b/zirgen/circuit/rv32im/v1/edsl/decode.cpp
index 9a3e04b2..3e55d946 100644
--- a/zirgen/circuit/rv32im/v1/edsl/decode.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/decode.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/decode.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/decode.h b/zirgen/circuit/rv32im/v1/edsl/decode.h
index 6b13731f..ef49f717 100644
--- a/zirgen/circuit/rv32im/v1/edsl/decode.h
+++ b/zirgen/circuit/rv32im/v1/edsl/decode.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/divide.cpp b/zirgen/circuit/rv32im/v1/edsl/divide.cpp
index e460f7c0..4adefc4f 100644
--- a/zirgen/circuit/rv32im/v1/edsl/divide.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/divide.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/compute.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/divide.h b/zirgen/circuit/rv32im/v1/edsl/divide.h
index 19df61a4..968f86b1 100644
--- a/zirgen/circuit/rv32im/v1/edsl/divide.h
+++ b/zirgen/circuit/rv32im/v1/edsl/divide.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/ecall.cpp b/zirgen/circuit/rv32im/v1/edsl/ecall.cpp
index b4e8cf48..c546d6bf 100644
--- a/zirgen/circuit/rv32im/v1/edsl/ecall.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/ecall.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/top.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/ecall.h b/zirgen/circuit/rv32im/v1/edsl/ecall.h
index 58b8bb3d..2e7b7b96 100644
--- a/zirgen/circuit/rv32im/v1/edsl/ecall.h
+++ b/zirgen/circuit/rv32im/v1/edsl/ecall.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/global.h b/zirgen/circuit/rv32im/v1/edsl/global.h
index 6454b764..d8664e4f 100644
--- a/zirgen/circuit/rv32im/v1/edsl/global.h
+++ b/zirgen/circuit/rv32im/v1/edsl/global.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/memio.cpp b/zirgen/circuit/rv32im/v1/edsl/memio.cpp
index 8f23ad61..7f2304a0 100644
--- a/zirgen/circuit/rv32im/v1/edsl/memio.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/memio.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/compute.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/memio.h b/zirgen/circuit/rv32im/v1/edsl/memio.h
index e800f669..e5695d2f 100644
--- a/zirgen/circuit/rv32im/v1/edsl/memio.h
+++ b/zirgen/circuit/rv32im/v1/edsl/memio.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/multiply.cpp b/zirgen/circuit/rv32im/v1/edsl/multiply.cpp
index bfa40747..ca704e03 100644
--- a/zirgen/circuit/rv32im/v1/edsl/multiply.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/multiply.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/compute.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/multiply.h b/zirgen/circuit/rv32im/v1/edsl/multiply.h
index 031bd0e7..b020abc7 100644
--- a/zirgen/circuit/rv32im/v1/edsl/multiply.h
+++ b/zirgen/circuit/rv32im/v1/edsl/multiply.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/page_fault.cpp b/zirgen/circuit/rv32im/v1/edsl/page_fault.cpp
index 1369ba0b..920e2132 100644
--- a/zirgen/circuit/rv32im/v1/edsl/page_fault.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/page_fault.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/page_fault.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/page_fault.h b/zirgen/circuit/rv32im/v1/edsl/page_fault.h
index e64f248d..bb8cc94b 100644
--- a/zirgen/circuit/rv32im/v1/edsl/page_fault.h
+++ b/zirgen/circuit/rv32im/v1/edsl/page_fault.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/rv32im.cpp b/zirgen/circuit/rv32im/v1/edsl/rv32im.cpp
index f104937b..b178f067 100644
--- a/zirgen/circuit/rv32im/v1/edsl/rv32im.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/rv32im.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/IR/IR.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/sha.cpp b/zirgen/circuit/rv32im/v1/edsl/sha.cpp
index 6aa5bfca..85f3cc98 100644
--- a/zirgen/circuit/rv32im/v1/edsl/sha.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/sha.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/compute.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/sha.h b/zirgen/circuit/rv32im/v1/edsl/sha.h
index 2e839888..46136122 100644
--- a/zirgen/circuit/rv32im/v1/edsl/sha.h
+++ b/zirgen/circuit/rv32im/v1/edsl/sha.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/top.cpp b/zirgen/circuit/rv32im/v1/edsl/top.cpp
index 12ff9609..c0247224 100644
--- a/zirgen/circuit/rv32im/v1/edsl/top.cpp
+++ b/zirgen/circuit/rv32im/v1/edsl/top.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/top.h"
 
diff --git a/zirgen/circuit/rv32im/v1/edsl/top.h b/zirgen/circuit/rv32im/v1/edsl/top.h
index f3b10fcf..ee69535f 100644
--- a/zirgen/circuit/rv32im/v1/edsl/top.h
+++ b/zirgen/circuit/rv32im/v1/edsl/top.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/edsl/body.h"
 #include "zirgen/circuit/rv32im/v1/edsl/code.h"
diff --git a/zirgen/circuit/rv32im/v1/platform/constants.h b/zirgen/circuit/rv32im/v1/platform/constants.h
index f3d1993a..09d10235 100644
--- a/zirgen/circuit/rv32im/v1/platform/constants.h
+++ b/zirgen/circuit/rv32im/v1/platform/constants.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/platform/opcodes.cpp b/zirgen/circuit/rv32im/v1/platform/opcodes.cpp
index a747516d..50f6be65 100644
--- a/zirgen/circuit/rv32im/v1/platform/opcodes.cpp
+++ b/zirgen/circuit/rv32im/v1/platform/opcodes.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/platform/opcodes.h"
 
diff --git a/zirgen/circuit/rv32im/v1/platform/opcodes.h b/zirgen/circuit/rv32im/v1/platform/opcodes.h
index e730b7a4..922b4477 100644
--- a/zirgen/circuit/rv32im/v1/platform/opcodes.h
+++ b/zirgen/circuit/rv32im/v1/platform/opcodes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/platform/page_table.cpp b/zirgen/circuit/rv32im/v1/platform/page_table.cpp
index 3f4e2d30..e9e1230f 100644
--- a/zirgen/circuit/rv32im/v1/platform/page_table.cpp
+++ b/zirgen/circuit/rv32im/v1/platform/page_table.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/platform/page_table.h"
 
diff --git a/zirgen/circuit/rv32im/v1/platform/page_table.h b/zirgen/circuit/rv32im/v1/platform/page_table.h
index 32bce340..3301d9c9 100644
--- a/zirgen/circuit/rv32im/v1/platform/page_table.h
+++ b/zirgen/circuit/rv32im/v1/platform/page_table.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/platform/rv32im.inl b/zirgen/circuit/rv32im/v1/platform/rv32im.inl
index 1129c94e..93f85c35 100644
--- a/zirgen/circuit/rv32im/v1/platform/rv32im.inl
+++ b/zirgen/circuit/rv32im/v1/platform/rv32im.inl
@@ -1,5 +1,16 @@
-// Copyright 2022 Risc0, Inc.
-// All rights reserved.
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
 
 #ifndef OPC
 #define OPC(...) /**/
diff --git a/zirgen/circuit/rv32im/v1/test/guest.h b/zirgen/circuit/rv32im/v1/test/guest.h
index 8f7bbf7e..e33f2207 100644
--- a/zirgen/circuit/rv32im/v1/test/guest.h
+++ b/zirgen/circuit/rv32im/v1/test/guest.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/risc0-simulate.cpp b/zirgen/circuit/rv32im/v1/test/risc0-simulate.cpp
index 2f6b70e2..04ac9a46 100644
--- a/zirgen/circuit/rv32im/v1/test/risc0-simulate.cpp
+++ b/zirgen/circuit/rv32im/v1/test/risc0-simulate.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/log.h"
diff --git a/zirgen/circuit/rv32im/v1/test/riscv_test.h b/zirgen/circuit/rv32im/v1/test/riscv_test.h
index a54692a0..73220c7d 100644
--- a/zirgen/circuit/rv32im/v1/test/riscv_test.h
+++ b/zirgen/circuit/rv32im/v1/test/riscv_test.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #define __riscv_xlen 32
 #define TESTNUM x31
diff --git a/zirgen/circuit/rv32im/v1/test/run_test.py b/zirgen/circuit/rv32im/v1/test/run_test.py
index d4edefe9..6748493b 100644
--- a/zirgen/circuit/rv32im/v1/test/run_test.py
+++ b/zirgen/circuit/rv32im/v1/test/run_test.py
@@ -1,7 +1,17 @@
-# Copyright 2022 Risc0, Inc.
-# All rights reserved.
-
 #!/usr/bin/env python
+# Copyright 2022 RISC Zero, Inc.
+#
+# 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.
 
 import subprocess
 import sys
diff --git a/zirgen/circuit/rv32im/v1/test/runner.cpp b/zirgen/circuit/rv32im/v1/test/runner.cpp
index 9ac00ed6..7453cd1b 100644
--- a/zirgen/circuit/rv32im/v1/test/runner.cpp
+++ b/zirgen/circuit/rv32im/v1/test/runner.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/test/runner.h"
 
diff --git a/zirgen/circuit/rv32im/v1/test/runner.h b/zirgen/circuit/rv32im/v1/test/runner.h
index 9c49af93..c4836b94 100644
--- a/zirgen/circuit/rv32im/v1/test/runner.h
+++ b/zirgen/circuit/rv32im/v1/test/runner.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/rv32im/v1/test/smoke.cpp b/zirgen/circuit/rv32im/v1/test/smoke.cpp
index 9587767e..35311144 100644
--- a/zirgen/circuit/rv32im/v1/test/smoke.cpp
+++ b/zirgen/circuit/rv32im/v1/test/smoke.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/rv32im/v1/test/runner.h"
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-bigint-guest.cpp b/zirgen/circuit/rv32im/v1/test/test-bigint-guest.cpp
index 7c5e8a60..644eefcd 100644
--- a/zirgen/circuit/rv32im/v1/test/test-bigint-guest.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-bigint-guest.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-bigint-host.cpp b/zirgen/circuit/rv32im/v1/test/test-bigint-host.cpp
index ad5d10b4..5f46b0ba 100644
--- a/zirgen/circuit/rv32im/v1/test/test-bigint-host.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-bigint-host.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/test/test-input-guest.cpp b/zirgen/circuit/rv32im/v1/test/test-input-guest.cpp
index addd214e..bce511c8 100644
--- a/zirgen/circuit/rv32im/v1/test/test-input-guest.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-input-guest.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-input-host.cpp b/zirgen/circuit/rv32im/v1/test/test-input-host.cpp
index f8c08ddc..c4d3c9ef 100644
--- a/zirgen/circuit/rv32im/v1/test/test-input-host.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-input-host.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/test/test-io-guest.cpp b/zirgen/circuit/rv32im/v1/test/test-io-guest.cpp
index 1bd7ed72..3a6db6b6 100644
--- a/zirgen/circuit/rv32im/v1/test/test-io-guest.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-io-guest.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-io-host.cpp b/zirgen/circuit/rv32im/v1/test/test-io-host.cpp
index e69124b5..ad0aec90 100644
--- a/zirgen/circuit/rv32im/v1/test/test-io-host.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-io-host.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/test/test-kernel.cpp b/zirgen/circuit/rv32im/v1/test/test-kernel.cpp
index 5602fe04..05202bdc 100644
--- a/zirgen/circuit/rv32im/v1/test/test-kernel.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-kernel.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <stdint.h>
 #include <sys/errno.h>
diff --git a/zirgen/circuit/rv32im/v1/test/test-linux-abi.cpp b/zirgen/circuit/rv32im/v1/test/test-linux-abi.cpp
index 761029ba..6adc8c98 100644
--- a/zirgen/circuit/rv32im/v1/test/test-linux-abi.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-linux-abi.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/log.h"
diff --git a/zirgen/circuit/rv32im/v1/test/test-pause-guest.cpp b/zirgen/circuit/rv32im/v1/test/test-pause-guest.cpp
index 1878d2e1..b0ad8785 100644
--- a/zirgen/circuit/rv32im/v1/test/test-pause-guest.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-pause-guest.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-pause-host.cpp b/zirgen/circuit/rv32im/v1/test/test-pause-host.cpp
index 165d8083..abd8a737 100644
--- a/zirgen/circuit/rv32im/v1/test/test-pause-host.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-pause-host.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/test/test-sha-buffer.cpp b/zirgen/circuit/rv32im/v1/test/test-sha-buffer.cpp
index b8e016e3..fdbb6e5d 100644
--- a/zirgen/circuit/rv32im/v1/test/test-sha-buffer.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-sha-buffer.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-sha-host.cpp b/zirgen/circuit/rv32im/v1/test/test-sha-host.cpp
index cc343737..38458a24 100644
--- a/zirgen/circuit/rv32im/v1/test/test-sha-host.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-sha-host.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/test/test-sha-pair.cpp b/zirgen/circuit/rv32im/v1/test/test-sha-pair.cpp
index 797b30e8..bf70642b 100644
--- a/zirgen/circuit/rv32im/v1/test/test-sha-pair.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-sha-pair.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-usermode-guest.cpp b/zirgen/circuit/rv32im/v1/test/test-usermode-guest.cpp
index 9a7c9500..1256f141 100644
--- a/zirgen/circuit/rv32im/v1/test/test-usermode-guest.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-usermode-guest.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <cstdint>
 
diff --git a/zirgen/circuit/rv32im/v1/test/test-usermode-host.cpp b/zirgen/circuit/rv32im/v1/test/test-usermode-host.cpp
index a78e4083..03f8b8b5 100644
--- a/zirgen/circuit/rv32im/v1/test/test-usermode-host.cpp
+++ b/zirgen/circuit/rv32im/v1/test/test-usermode-host.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "risc0/core/elf.h"
 #include "risc0/core/util.h"
diff --git a/zirgen/circuit/rv32im/v1/test/user-guest.cpp b/zirgen/circuit/rv32im/v1/test/user-guest.cpp
index 48e59bf2..365d79c7 100644
--- a/zirgen/circuit/rv32im/v1/test/user-guest.cpp
+++ b/zirgen/circuit/rv32im/v1/test/user-guest.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <unistd.h>
 
diff --git a/zirgen/circuit/verify/circom/circom.cpp b/zirgen/circuit/verify/circom/circom.cpp
index 3516d4ad..1a44072b 100644
--- a/zirgen/circuit/verify/circom/circom.cpp
+++ b/zirgen/circuit/verify/circom/circom.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/circom/circom.h"
 #include "zirgen/compiler/zkp/poseidon_254.h"
diff --git a/zirgen/circuit/verify/circom/circom.h b/zirgen/circuit/verify/circom/circom.h
index 9550ac39..0989d6ce 100644
--- a/zirgen/circuit/verify/circom/circom.h
+++ b/zirgen/circuit/verify/circom/circom.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/circom/test/AB.cpp b/zirgen/circuit/verify/circom/test/AB.cpp
index c362bd9a..abeca74a 100644
--- a/zirgen/circuit/verify/circom/test/AB.cpp
+++ b/zirgen/circuit/verify/circom/test/AB.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/circom/test/AB.h"
 #include "zirgen/compiler/zkp/poseidon_254.h"
diff --git a/zirgen/circuit/verify/circom/test/AB.h b/zirgen/circuit/verify/circom/test/AB.h
index 2e3e333a..3b355220 100644
--- a/zirgen/circuit/verify/circom/test/AB.h
+++ b/zirgen/circuit/verify/circom/test/AB.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Pass/PassManager.h"
 #include "zirgen/Dialect/Zll/Transforms/Passes.h"
diff --git a/zirgen/circuit/verify/circom/test/run_circom.cpp b/zirgen/circuit/verify/circom/test/run_circom.cpp
index 19128609..55b3e96d 100644
--- a/zirgen/circuit/verify/circom/test/run_circom.cpp
+++ b/zirgen/circuit/verify/circom/test/run_circom.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/circom/test/run_circom.h"
 
diff --git a/zirgen/circuit/verify/circom/test/run_circom.h b/zirgen/circuit/verify/circom/test/run_circom.h
index 28c6b7ee..50e50bbd 100644
--- a/zirgen/circuit/verify/circom/test/run_circom.h
+++ b/zirgen/circuit/verify/circom/test/run_circom.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/circom/to_snark.cpp b/zirgen/circuit/verify/circom/to_snark.cpp
index 16eae880..d24d3a73 100644
--- a/zirgen/circuit/verify/circom/to_snark.cpp
+++ b/zirgen/circuit/verify/circom/to_snark.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <fstream>
 #include <iostream>
diff --git a/zirgen/circuit/verify/fri.cpp b/zirgen/circuit/verify/fri.cpp
index 7c455fcb..d3135bfe 100644
--- a/zirgen/circuit/verify/fri.cpp
+++ b/zirgen/circuit/verify/fri.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/fri.h"
 
diff --git a/zirgen/circuit/verify/fri.h b/zirgen/circuit/verify/fri.h
index 07c61a6b..8d2797fe 100644
--- a/zirgen/circuit/verify/fri.h
+++ b/zirgen/circuit/verify/fri.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/merkle.cpp b/zirgen/circuit/verify/merkle.cpp
index 82a338d4..bef5660b 100644
--- a/zirgen/circuit/verify/merkle.cpp
+++ b/zirgen/circuit/verify/merkle.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/merkle.h"
 
diff --git a/zirgen/circuit/verify/merkle.h b/zirgen/circuit/verify/merkle.h
index 7327a23b..728d7221 100644
--- a/zirgen/circuit/verify/merkle.h
+++ b/zirgen/circuit/verify/merkle.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/poly.cpp b/zirgen/circuit/verify/poly.cpp
index 0732eaad..d8adff7a 100644
--- a/zirgen/circuit/verify/poly.cpp
+++ b/zirgen/circuit/verify/poly.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/poly.h"
 
diff --git a/zirgen/circuit/verify/poly.h b/zirgen/circuit/verify/poly.h
index 4b9c3abe..fb677e39 100644
--- a/zirgen/circuit/verify/poly.h
+++ b/zirgen/circuit/verify/poly.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/test/fri.cpp b/zirgen/circuit/verify/test/fri.cpp
index 4a956701..56d8fe3e 100644
--- a/zirgen/circuit/verify/test/fri.cpp
+++ b/zirgen/circuit/verify/test/fri.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Disable these tests to prevent dependencies on old RISC0 repo
 #if 0
diff --git a/zirgen/circuit/verify/test/merkle.cpp b/zirgen/circuit/verify/test/merkle.cpp
index 05c132f9..a87dde93 100644
--- a/zirgen/circuit/verify/test/merkle.cpp
+++ b/zirgen/circuit/verify/test/merkle.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Disable these tests to prevent dependencies on old RISC0 repo
 #if 0
diff --git a/zirgen/circuit/verify/test/verify-zirgen.cpp b/zirgen/circuit/verify/test/verify-zirgen.cpp
index eb42d192..16d8cc9b 100644
--- a/zirgen/circuit/verify/test/verify-zirgen.cpp
+++ b/zirgen/circuit/verify/test/verify-zirgen.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <gtest/gtest.h>
 
diff --git a/zirgen/circuit/verify/test/verify.cpp b/zirgen/circuit/verify/test/verify.cpp
index c0e20443..0c5bbf36 100644
--- a/zirgen/circuit/verify/test/verify.cpp
+++ b/zirgen/circuit/verify/test/verify.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <gtest/gtest.h>
 
diff --git a/zirgen/circuit/verify/verify.cpp b/zirgen/circuit/verify/verify.cpp
index 69251d12..e99d4b02 100644
--- a/zirgen/circuit/verify/verify.cpp
+++ b/zirgen/circuit/verify/verify.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/verify.h"
 
diff --git a/zirgen/circuit/verify/verify.h b/zirgen/circuit/verify/verify.h
index 27d0c611..af26f5f7 100644
--- a/zirgen/circuit/verify/verify.h
+++ b/zirgen/circuit/verify/verify.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/wrap.h b/zirgen/circuit/verify/wrap.h
index f0fd1f0b..052e0b2b 100644
--- a/zirgen/circuit/verify/wrap.h
+++ b/zirgen/circuit/verify/wrap.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/verify.h"
 
diff --git a/zirgen/circuit/verify/wrap_recursion.cpp b/zirgen/circuit/verify/wrap_recursion.cpp
index bbbf9d73..7423e2fa 100644
--- a/zirgen/circuit/verify/wrap_recursion.cpp
+++ b/zirgen/circuit/verify/wrap_recursion.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/wrap.h"
 
diff --git a/zirgen/circuit/verify/wrap_recursion.h b/zirgen/circuit/verify/wrap_recursion.h
index d59b9060..dfedc397 100644
--- a/zirgen/circuit/verify/wrap_recursion.h
+++ b/zirgen/circuit/verify/wrap_recursion.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/wrap_rv32im.cpp b/zirgen/circuit/verify/wrap_rv32im.cpp
index dae38dff..d04c211c 100644
--- a/zirgen/circuit/verify/wrap_rv32im.cpp
+++ b/zirgen/circuit/verify/wrap_rv32im.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/circuit/verify/wrap.h"
 
diff --git a/zirgen/circuit/verify/wrap_rv32im.h b/zirgen/circuit/verify/wrap_rv32im.h
index dd619dc0..cd710be4 100644
--- a/zirgen/circuit/verify/wrap_rv32im.h
+++ b/zirgen/circuit/verify/wrap_rv32im.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/circuit/verify/wrap_zirgen.cpp b/zirgen/circuit/verify/wrap_zirgen.cpp
index f3e06855..5bb154a8 100644
--- a/zirgen/circuit/verify/wrap_zirgen.cpp
+++ b/zirgen/circuit/verify/wrap_zirgen.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/IR/IRMapping.h"
diff --git a/zirgen/circuit/verify/wrap_zirgen.h b/zirgen/circuit/verify/wrap_zirgen.h
index d0beb620..06a83ab8 100644
--- a/zirgen/circuit/verify/wrap_zirgen.h
+++ b/zirgen/circuit/verify/wrap_zirgen.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/codegen/CppLanguageSyntax.cpp b/zirgen/compiler/codegen/CppLanguageSyntax.cpp
index e8ec3e20..bec14df6 100644
--- a/zirgen/compiler/codegen/CppLanguageSyntax.cpp
+++ b/zirgen/compiler/codegen/CppLanguageSyntax.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
diff --git a/zirgen/compiler/codegen/RustLanguageSyntax.cpp b/zirgen/compiler/codegen/RustLanguageSyntax.cpp
index c93b69c0..81019967 100644
--- a/zirgen/compiler/codegen/RustLanguageSyntax.cpp
+++ b/zirgen/compiler/codegen/RustLanguageSyntax.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
diff --git a/zirgen/compiler/codegen/codegen.cpp b/zirgen/compiler/codegen/codegen.cpp
index 51be86c9..4be82f7a 100644
--- a/zirgen/compiler/codegen/codegen.cpp
+++ b/zirgen/compiler/codegen/codegen.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/codegen/codegen.h"
 #include "zirgen/compiler/codegen/protocol_info_const.h"
diff --git a/zirgen/compiler/codegen/codegen.h b/zirgen/compiler/codegen/codegen.h
index adffecfa..dbffb98c 100644
--- a/zirgen/compiler/codegen/codegen.h
+++ b/zirgen/compiler/codegen/codegen.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/codegen/gen_cpp.cpp b/zirgen/compiler/codegen/gen_cpp.cpp
index c4ff0917..31f97a30 100644
--- a/zirgen/compiler/codegen/gen_cpp.cpp
+++ b/zirgen/compiler/codegen/gen_cpp.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/codegen/codegen.h"
 
diff --git a/zirgen/compiler/codegen/gen_gpu.cpp b/zirgen/compiler/codegen/gen_gpu.cpp
index 5bdbe3fd..fc9f6cb1 100644
--- a/zirgen/compiler/codegen/gen_gpu.cpp
+++ b/zirgen/compiler/codegen/gen_gpu.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/Zll/Analysis/MixPowerAnalysis.h"
 
diff --git a/zirgen/compiler/codegen/gen_recursion.cpp b/zirgen/compiler/codegen/gen_recursion.cpp
index fdcbcbd1..fbd62c8e 100644
--- a/zirgen/compiler/codegen/gen_recursion.cpp
+++ b/zirgen/compiler/codegen/gen_recursion.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/codegen/codegen.h"
 
diff --git a/zirgen/compiler/codegen/gen_rust.cpp b/zirgen/compiler/codegen/gen_rust.cpp
index b141695e..f44ae7ef 100644
--- a/zirgen/compiler/codegen/gen_rust.cpp
+++ b/zirgen/compiler/codegen/gen_rust.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/codegen/codegen.h"
 
diff --git a/zirgen/compiler/codegen/mustache.h b/zirgen/compiler/codegen/mustache.h
index c49793c7..503058bb 100644
--- a/zirgen/compiler/codegen/mustache.h
+++ b/zirgen/compiler/codegen/mustache.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 /*
  * Boost Software License - Version 1.0
diff --git a/zirgen/compiler/codegen/protocol_info_const.h b/zirgen/compiler/codegen/protocol_info_const.h
index 814be68e..0ba1794c 100644
--- a/zirgen/compiler/codegen/protocol_info_const.h
+++ b/zirgen/compiler/codegen/protocol_info_const.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 /// Protocol info strings for the proof system and circuits. Used to seed the
 /// Fiat-Shamir transcript and provide domain seperation between different
diff --git a/zirgen/compiler/edsl/component.cpp b/zirgen/compiler/edsl/component.cpp
index ceda1875..cb92dd88 100644
--- a/zirgen/compiler/edsl/component.cpp
+++ b/zirgen/compiler/edsl/component.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/edsl/component.h"
 #include "llvm/ADT/StringExtras.h"
diff --git a/zirgen/compiler/edsl/component.h b/zirgen/compiler/edsl/component.h
index b747c8df..111a52f4 100644
--- a/zirgen/compiler/edsl/component.h
+++ b/zirgen/compiler/edsl/component.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/edsl/edsl.cpp b/zirgen/compiler/edsl/edsl.cpp
index 53882162..43efb5ac 100644
--- a/zirgen/compiler/edsl/edsl.cpp
+++ b/zirgen/compiler/edsl/edsl.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/edsl/edsl.h"
 
diff --git a/zirgen/compiler/edsl/edsl.h b/zirgen/compiler/edsl/edsl.h
index d2ab402a..811cf93c 100644
--- a/zirgen/compiler/edsl/edsl.h
+++ b/zirgen/compiler/edsl/edsl.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/edsl/layout.cpp b/zirgen/compiler/edsl/layout.cpp
index 25d5d02b..f342eeff 100644
--- a/zirgen/compiler/edsl/layout.cpp
+++ b/zirgen/compiler/edsl/layout.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/edsl/edsl.h"
 
diff --git a/zirgen/compiler/edsl/source_loc.h b/zirgen/compiler/edsl/source_loc.h
index 809112ee..092e87bb 100644
--- a/zirgen/compiler/edsl/source_loc.h
+++ b/zirgen/compiler/edsl/source_loc.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/edsl/test.cpp b/zirgen/compiler/edsl/test.cpp
index fecad435..03e859ae 100644
--- a/zirgen/compiler/edsl/test.cpp
+++ b/zirgen/compiler/edsl/test.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "edsl.h"
 
diff --git a/zirgen/compiler/layout/collect.cpp b/zirgen/compiler/layout/collect.cpp
index 52b32f1f..3fa697bf 100644
--- a/zirgen/compiler/layout/collect.cpp
+++ b/zirgen/compiler/layout/collect.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/layout/collect.h"
 #include "mlir/IR/Types.h"
diff --git a/zirgen/compiler/layout/collect.h b/zirgen/compiler/layout/collect.h
index 31764a07..aa3ab507 100644
--- a/zirgen/compiler/layout/collect.h
+++ b/zirgen/compiler/layout/collect.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/layout/convert.cpp b/zirgen/compiler/layout/convert.cpp
index bd564967..394a95c6 100644
--- a/zirgen/compiler/layout/convert.cpp
+++ b/zirgen/compiler/layout/convert.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/layout/convert.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
diff --git a/zirgen/compiler/layout/convert.h b/zirgen/compiler/layout/convert.h
index e5404212..c4b1d56a 100644
--- a/zirgen/compiler/layout/convert.h
+++ b/zirgen/compiler/layout/convert.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/layout/improve.cpp b/zirgen/compiler/layout/improve.cpp
index b6049905..2a42a384 100644
--- a/zirgen/compiler/layout/improve.cpp
+++ b/zirgen/compiler/layout/improve.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Potential future improvements:
 // - After reordering a struct which appears within an inner union, don't
diff --git a/zirgen/compiler/layout/improve.h b/zirgen/compiler/layout/improve.h
index 4b9bcebb..6f182145 100644
--- a/zirgen/compiler/layout/improve.h
+++ b/zirgen/compiler/layout/improve.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/layout/rebuild.cpp b/zirgen/compiler/layout/rebuild.cpp
index 8325c0a0..cedac8db 100644
--- a/zirgen/compiler/layout/rebuild.cpp
+++ b/zirgen/compiler/layout/rebuild.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/layout/rebuild.h"
 
diff --git a/zirgen/compiler/layout/rebuild.h b/zirgen/compiler/layout/rebuild.h
index 0099087d..12bc7dbf 100644
--- a/zirgen/compiler/layout/rebuild.h
+++ b/zirgen/compiler/layout/rebuild.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/layout/viz.cpp b/zirgen/compiler/layout/viz.cpp
index d6a3673b..865e9d3f 100644
--- a/zirgen/compiler/layout/viz.cpp
+++ b/zirgen/compiler/layout/viz.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/layout/viz.h"
 #include "zirgen/Dialect/ZStruct/IR/ZStruct.h"
diff --git a/zirgen/compiler/layout/viz.h b/zirgen/compiler/layout/viz.h
index d7f3968e..ef5824eb 100644
--- a/zirgen/compiler/layout/viz.h
+++ b/zirgen/compiler/layout/viz.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/passes/test/AB.cpp b/zirgen/compiler/passes/test/AB.cpp
index 5cd723ff..1c14d27d 100644
--- a/zirgen/compiler/passes/test/AB.cpp
+++ b/zirgen/compiler/passes/test/AB.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // AB tests; runs the functions in both the emulator, and in the
 // recursion circuit in the emulator, and compares the results to make
diff --git a/zirgen/compiler/passes/test/AB.h b/zirgen/compiler/passes/test/AB.h
index 248d45a1..f5e4f13f 100644
--- a/zirgen/compiler/passes/test/AB.h
+++ b/zirgen/compiler/passes/test/AB.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/r1cs/lower.cpp b/zirgen/compiler/r1cs/lower.cpp
index 8e9d3074..0416b747 100644
--- a/zirgen/compiler/r1cs/lower.cpp
+++ b/zirgen/compiler/r1cs/lower.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/r1cs/lower.h"
 #include "zirgen/Dialect/R1CS/IR/R1CS.h"
diff --git a/zirgen/compiler/r1cs/lower.h b/zirgen/compiler/r1cs/lower.h
index 200cca59..4be7776d 100644
--- a/zirgen/compiler/r1cs/lower.h
+++ b/zirgen/compiler/r1cs/lower.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/r1cs/r1csfile.cpp b/zirgen/compiler/r1cs/r1csfile.cpp
index ec833ab8..e0858c3f 100644
--- a/zirgen/compiler/r1cs/r1csfile.cpp
+++ b/zirgen/compiler/r1cs/r1csfile.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/r1cs/r1csfile.h"
 
diff --git a/zirgen/compiler/r1cs/r1csfile.h b/zirgen/compiler/r1cs/r1csfile.h
index a3a2b309..d8d72918 100644
--- a/zirgen/compiler/r1cs/r1csfile.h
+++ b/zirgen/compiler/r1cs/r1csfile.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/r1cs/test/r1csfile.cpp b/zirgen/compiler/r1cs/test/r1csfile.cpp
index 10638b08..57596f93 100644
--- a/zirgen/compiler/r1cs/test/r1csfile.cpp
+++ b/zirgen/compiler/r1cs/test/r1csfile.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/r1cs/r1csfile.h"
 
diff --git a/zirgen/compiler/r1cs/validate.cpp b/zirgen/compiler/r1cs/validate.cpp
index 039d1e0d..337f31e5 100644
--- a/zirgen/compiler/r1cs/validate.cpp
+++ b/zirgen/compiler/r1cs/validate.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <iostream>
 
diff --git a/zirgen/compiler/r1cs/validate.h b/zirgen/compiler/r1cs/validate.h
index 1ab0751b..da14d7ee 100644
--- a/zirgen/compiler/r1cs/validate.h
+++ b/zirgen/compiler/r1cs/validate.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/r1cs/wtnsfile.cpp b/zirgen/compiler/r1cs/wtnsfile.cpp
index 3fa7ce44..d67d9907 100644
--- a/zirgen/compiler/r1cs/wtnsfile.cpp
+++ b/zirgen/compiler/r1cs/wtnsfile.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/r1cs/wtnsfile.h"
 
diff --git a/zirgen/compiler/r1cs/wtnsfile.h b/zirgen/compiler/r1cs/wtnsfile.h
index 3fb3c89a..35fcb26d 100644
--- a/zirgen/compiler/r1cs/wtnsfile.h
+++ b/zirgen/compiler/r1cs/wtnsfile.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/tools/zirgen-opt.cpp b/zirgen/compiler/tools/zirgen-opt.cpp
index e6a9a94e..3b704661 100644
--- a/zirgen/compiler/tools/zirgen-opt.cpp
+++ b/zirgen/compiler/tools/zirgen-opt.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/BigInt/IR/BigInt.h"
 #include "zirgen/Dialect/BigInt/Transforms/Passes.h"
diff --git a/zirgen/compiler/tools/zirgen-r1cs.cpp b/zirgen/compiler/tools/zirgen-r1cs.cpp
index cb46d4fa..5057b32e 100644
--- a/zirgen/compiler/tools/zirgen-r1cs.cpp
+++ b/zirgen/compiler/tools/zirgen-r1cs.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <iostream>
 
diff --git a/zirgen/compiler/tools/zirgen-translate.cpp b/zirgen/compiler/tools/zirgen-translate.cpp
index 8de97b3e..ae740fd1 100644
--- a/zirgen/compiler/tools/zirgen-translate.cpp
+++ b/zirgen/compiler/tools/zirgen-translate.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/InitAllTranslations.h"
diff --git a/zirgen/compiler/zkp/baby_bear.h b/zirgen/compiler/zkp/baby_bear.h
index 884eede4..12447eab 100644
--- a/zirgen/compiler/zkp/baby_bear.h
+++ b/zirgen/compiler/zkp/baby_bear.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/digest.h b/zirgen/compiler/zkp/digest.h
index b8c2e38e..d6e3f5e1 100644
--- a/zirgen/compiler/zkp/digest.h
+++ b/zirgen/compiler/zkp/digest.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/hash.cpp b/zirgen/compiler/zkp/hash.cpp
index d29d889b..c4394f55 100644
--- a/zirgen/compiler/zkp/hash.cpp
+++ b/zirgen/compiler/zkp/hash.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/hash.h"
 #include "zirgen/compiler/zkp/baby_bear.h"
diff --git a/zirgen/compiler/zkp/hash.h b/zirgen/compiler/zkp/hash.h
index ddcb04d9..2573b879 100644
--- a/zirgen/compiler/zkp/hash.h
+++ b/zirgen/compiler/zkp/hash.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/poseidon.cpp b/zirgen/compiler/zkp/poseidon.cpp
index 0802795a..30e4a342 100644
--- a/zirgen/compiler/zkp/poseidon.cpp
+++ b/zirgen/compiler/zkp/poseidon.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <array>
 #include <iostream>
diff --git a/zirgen/compiler/zkp/poseidon.h b/zirgen/compiler/zkp/poseidon.h
index d3b42166..34e9b6b8 100644
--- a/zirgen/compiler/zkp/poseidon.h
+++ b/zirgen/compiler/zkp/poseidon.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/poseidon2.cpp b/zirgen/compiler/zkp/poseidon2.cpp
index b68af305..886a8cb9 100644
--- a/zirgen/compiler/zkp/poseidon2.cpp
+++ b/zirgen/compiler/zkp/poseidon2.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <array>
 #include <iostream>
diff --git a/zirgen/compiler/zkp/poseidon2.h b/zirgen/compiler/zkp/poseidon2.h
index 5e817556..cead0e29 100644
--- a/zirgen/compiler/zkp/poseidon2.h
+++ b/zirgen/compiler/zkp/poseidon2.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/poseidon2_consts.h b/zirgen/compiler/zkp/poseidon2_consts.h
index 61dc7ec7..ef4788ab 100644
--- a/zirgen/compiler/zkp/poseidon2_consts.h
+++ b/zirgen/compiler/zkp/poseidon2_consts.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 constexpr size_t CELLS = 24;
 constexpr size_t ROUNDS_HALF_FULL = 4;
diff --git a/zirgen/compiler/zkp/poseidon_254.cpp b/zirgen/compiler/zkp/poseidon_254.cpp
index 4a881071..73178f24 100644
--- a/zirgen/compiler/zkp/poseidon_254.cpp
+++ b/zirgen/compiler/zkp/poseidon_254.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/poseidon_254.h"
 
diff --git a/zirgen/compiler/zkp/poseidon_254.h b/zirgen/compiler/zkp/poseidon_254.h
index db5f873d..9e578de8 100644
--- a/zirgen/compiler/zkp/poseidon_254.h
+++ b/zirgen/compiler/zkp/poseidon_254.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/poseidon_consts.h b/zirgen/compiler/zkp/poseidon_consts.h
index 3d6290e5..f7e41f17 100644
--- a/zirgen/compiler/zkp/poseidon_consts.h
+++ b/zirgen/compiler/zkp/poseidon_consts.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // This file is automatically generated by:
 // cargo run --bin bootstrap-poseidon -- cpp
diff --git a/zirgen/compiler/zkp/read_iop.h b/zirgen/compiler/zkp/read_iop.h
index 78388aab..e50f29b7 100644
--- a/zirgen/compiler/zkp/read_iop.h
+++ b/zirgen/compiler/zkp/read_iop.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/sha256.h b/zirgen/compiler/zkp/sha256.h
index bafa0eb6..5e6a1724 100644
--- a/zirgen/compiler/zkp/sha256.h
+++ b/zirgen/compiler/zkp/sha256.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/sha_rng.cpp b/zirgen/compiler/zkp/sha_rng.cpp
index 03a51cc1..9350b504 100644
--- a/zirgen/compiler/zkp/sha_rng.cpp
+++ b/zirgen/compiler/zkp/sha_rng.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/sha_rng.h"
 #include "zirgen/compiler/zkp/baby_bear.h"
diff --git a/zirgen/compiler/zkp/sha_rng.h b/zirgen/compiler/zkp/sha_rng.h
index 01696b84..8a320e67 100644
--- a/zirgen/compiler/zkp/sha_rng.h
+++ b/zirgen/compiler/zkp/sha_rng.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/test/poseidon.cpp b/zirgen/compiler/zkp/test/poseidon.cpp
index e8e1d435..047a3055 100644
--- a/zirgen/compiler/zkp/test/poseidon.cpp
+++ b/zirgen/compiler/zkp/test/poseidon.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/poseidon.h"
 #include "zirgen/compiler/zkp/baby_bear.h"
diff --git a/zirgen/compiler/zkp/test/poseidon2.cpp b/zirgen/compiler/zkp/test/poseidon2.cpp
index 2d6ea24a..a4e5a5e9 100644
--- a/zirgen/compiler/zkp/test/poseidon2.cpp
+++ b/zirgen/compiler/zkp/test/poseidon2.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/poseidon2.h"
 #include "zirgen/compiler/zkp/baby_bear.h"
diff --git a/zirgen/compiler/zkp/util.cpp b/zirgen/compiler/zkp/util.cpp
index 92e9879b..08790bf1 100644
--- a/zirgen/compiler/zkp/util.cpp
+++ b/zirgen/compiler/zkp/util.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/compiler/zkp/util.h"
 
diff --git a/zirgen/compiler/zkp/util.h b/zirgen/compiler/zkp/util.h
index d4b4ddf5..07828cd8 100644
--- a/zirgen/compiler/zkp/util.h
+++ b/zirgen/compiler/zkp/util.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/compiler/zkp/zkp.h b/zirgen/compiler/zkp/zkp.h
index 24377f32..87588b58 100644
--- a/zirgen/compiler/zkp/zkp.h
+++ b/zirgen/compiler/zkp/zkp.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/bits.cpp b/zirgen/components/bits.cpp
index ac9fee12..83759f5c 100644
--- a/zirgen/components/bits.cpp
+++ b/zirgen/components/bits.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/bits.h"
 
diff --git a/zirgen/components/bits.h b/zirgen/components/bits.h
index 88550c3e..949d97c3 100644
--- a/zirgen/components/bits.h
+++ b/zirgen/components/bits.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/bytes.cpp b/zirgen/components/bytes.cpp
index 479f3651..6b5790b7 100644
--- a/zirgen/components/bytes.cpp
+++ b/zirgen/components/bytes.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/bytes.h"
 
diff --git a/zirgen/components/bytes.h b/zirgen/components/bytes.h
index 53806c2f..da0b80b0 100644
--- a/zirgen/components/bytes.h
+++ b/zirgen/components/bytes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/fpext.cpp b/zirgen/components/fpext.cpp
index bc167370..d68a48f9 100644
--- a/zirgen/components/fpext.cpp
+++ b/zirgen/components/fpext.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "fpext.h"
 
diff --git a/zirgen/components/fpext.h b/zirgen/components/fpext.h
index a7d61880..5a37fec7 100644
--- a/zirgen/components/fpext.h
+++ b/zirgen/components/fpext.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/iszero.cpp b/zirgen/components/iszero.cpp
index fda85af0..86b7c543 100644
--- a/zirgen/components/iszero.cpp
+++ b/zirgen/components/iszero.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/iszero.h"
 
diff --git a/zirgen/components/iszero.h b/zirgen/components/iszero.h
index fec2d7e3..1c87631a 100644
--- a/zirgen/components/iszero.h
+++ b/zirgen/components/iszero.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/mux.h b/zirgen/components/mux.h
index 7540b1c8..adf4566a 100644
--- a/zirgen/components/mux.h
+++ b/zirgen/components/mux.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/onehot.cpp b/zirgen/components/onehot.cpp
index c6596b73..e9177fba 100644
--- a/zirgen/components/onehot.cpp
+++ b/zirgen/components/onehot.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/onehot.h"
 
diff --git a/zirgen/components/onehot.h b/zirgen/components/onehot.h
index 0c338e33..c3e733cf 100644
--- a/zirgen/components/onehot.h
+++ b/zirgen/components/onehot.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/plonk.cpp b/zirgen/components/plonk.cpp
index 6cc272ba..c9650ac1 100644
--- a/zirgen/components/plonk.cpp
+++ b/zirgen/components/plonk.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Support/DebugStringHelper.h"
 #include "llvm/Support/FormatVariadic.h"
diff --git a/zirgen/components/plonk.h b/zirgen/components/plonk.h
index d9015a0c..199117b0 100644
--- a/zirgen/components/plonk.h
+++ b/zirgen/components/plonk.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/ram.cpp b/zirgen/components/ram.cpp
index 4501d8f2..6fabedd4 100644
--- a/zirgen/components/ram.cpp
+++ b/zirgen/components/ram.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/ram.h"
 
diff --git a/zirgen/components/ram.h b/zirgen/components/ram.h
index cc75742e..f08e8ec2 100644
--- a/zirgen/components/ram.h
+++ b/zirgen/components/ram.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/reg.h b/zirgen/components/reg.h
index 765f2ec3..60fcd324 100644
--- a/zirgen/components/reg.h
+++ b/zirgen/components/reg.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/test/bits.cpp b/zirgen/components/test/bits.cpp
index 36f870f5..0f6e299b 100644
--- a/zirgen/components/test/bits.cpp
+++ b/zirgen/components/test/bits.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/bits.h"
 
diff --git a/zirgen/components/test/bytes.cpp b/zirgen/components/test/bytes.cpp
index e9ca578a..99f2f19b 100644
--- a/zirgen/components/test/bytes.cpp
+++ b/zirgen/components/test/bytes.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/bytes.h"
 
diff --git a/zirgen/components/test/fpext.cpp b/zirgen/components/test/fpext.cpp
index fb177448..4518ce34 100644
--- a/zirgen/components/test/fpext.cpp
+++ b/zirgen/components/test/fpext.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/fpext.h"
 
diff --git a/zirgen/components/test/mux.cpp b/zirgen/components/test/mux.cpp
index 35759a25..ea8fda1b 100644
--- a/zirgen/components/test/mux.cpp
+++ b/zirgen/components/test/mux.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/mux.h"
 
diff --git a/zirgen/components/test/onehot.cpp b/zirgen/components/test/onehot.cpp
index c01d1290..e017f527 100644
--- a/zirgen/components/test/onehot.cpp
+++ b/zirgen/components/test/onehot.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/onehot.h"
 
diff --git a/zirgen/components/test/plonk.cpp b/zirgen/components/test/plonk.cpp
index 467047ba..624042e1 100644
--- a/zirgen/components/test/plonk.cpp
+++ b/zirgen/components/test/plonk.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/plonk.h"
 
diff --git a/zirgen/components/test/ram.cpp b/zirgen/components/test/ram.cpp
index ab6da2e2..4c3835f8 100644
--- a/zirgen/components/test/ram.cpp
+++ b/zirgen/components/test/ram.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/ram.h"
 
diff --git a/zirgen/components/test/reg.cpp b/zirgen/components/test/reg.cpp
index 9dededb4..c5b3b9c0 100644
--- a/zirgen/components/test/reg.cpp
+++ b/zirgen/components/test/reg.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/reg.h"
 #include "zirgen/components/fpext.h"
diff --git a/zirgen/components/test/test_runner.cpp b/zirgen/components/test/test_runner.cpp
index 7df3ef07..4c4f075f 100644
--- a/zirgen/components/test/test_runner.cpp
+++ b/zirgen/components/test/test_runner.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/test/test_runner.h"
 
diff --git a/zirgen/components/test/test_runner.h b/zirgen/components/test/test_runner.h
index 0577fe8f..fbb8f336 100644
--- a/zirgen/components/test/test_runner.h
+++ b/zirgen/components/test/test_runner.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/test/test_with_bytes.h b/zirgen/components/test/test_with_bytes.h
index d7917e7b..20da96a6 100644
--- a/zirgen/components/test/test_with_bytes.h
+++ b/zirgen/components/test/test_with_bytes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/components/test/u32.cpp b/zirgen/components/test/u32.cpp
index 57eda1af..adeb88e6 100644
--- a/zirgen/components/test/u32.cpp
+++ b/zirgen/components/test/u32.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/components/u32.h"
 
diff --git a/zirgen/components/u32.cpp b/zirgen/components/u32.cpp
index 8033f3b8..64b4ce22 100644
--- a/zirgen/components/u32.cpp
+++ b/zirgen/components/u32.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "u32.h"
 
diff --git a/zirgen/components/u32.h b/zirgen/components/u32.h
index 68157688..c6b1ec43 100644
--- a/zirgen/components/u32.h
+++ b/zirgen/components/u32.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/Analysis/LayoutDAGAnalysis.cpp b/zirgen/dsl/Analysis/LayoutDAGAnalysis.cpp
index 2132ca0f..2c9cec81 100644
--- a/zirgen/dsl/Analysis/LayoutDAGAnalysis.cpp
+++ b/zirgen/dsl/Analysis/LayoutDAGAnalysis.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/Analysis/LayoutDAGAnalysis.h"
 #include "mlir/Analysis/CallGraph.h"
diff --git a/zirgen/dsl/Analysis/LayoutDAGAnalysis.h b/zirgen/dsl/Analysis/LayoutDAGAnalysis.h
index bc315815..9d62a413 100644
--- a/zirgen/dsl/Analysis/LayoutDAGAnalysis.h
+++ b/zirgen/dsl/Analysis/LayoutDAGAnalysis.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Analysis/DataFlow/ConstantPropagationAnalysis.h"
 #include "mlir/Analysis/DataFlow/DeadCodeAnalysis.h"
diff --git a/zirgen/dsl/ast.cpp b/zirgen/dsl/ast.cpp
index ea96b284..ea10bc3a 100644
--- a/zirgen/dsl/ast.cpp
+++ b/zirgen/dsl/ast.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "ast.h"
 
diff --git a/zirgen/dsl/ast.h b/zirgen/dsl/ast.h
index ee3fc8b1..1249affa 100644
--- a/zirgen/dsl/ast.h
+++ b/zirgen/dsl/ast.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/driver.cpp b/zirgen/dsl/driver.cpp
index 7da72f5a..b2ccd1d5 100644
--- a/zirgen/dsl/driver.cpp
+++ b/zirgen/dsl/driver.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <fstream>
 #include <iostream>
diff --git a/zirgen/dsl/examples/Fp.h b/zirgen/dsl/examples/Fp.h
index 2307413c..5ea092c1 100644
--- a/zirgen/dsl/examples/Fp.h
+++ b/zirgen/dsl/examples/Fp.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Circuit-agnostic code for toy example circuits
 
diff --git a/zirgen/dsl/examples/calculator.cpp b/zirgen/dsl/examples/calculator.cpp
index 3d4de2e8..32a3801c 100644
--- a/zirgen/dsl/examples/calculator.cpp
+++ b/zirgen/dsl/examples/calculator.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Does simple tests of the "calculator" circuit
 
diff --git a/zirgen/dsl/examples/calculator/cpu.rs b/zirgen/dsl/examples/calculator/cpu.rs
index ff1bae93..91377e51 100644
--- a/zirgen/dsl/examples/calculator/cpu.rs
+++ b/zirgen/dsl/examples/calculator/cpu.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use super::calc_circuit;
 use anyhow::Result;
diff --git a/zirgen/dsl/examples/calculator/main.rs b/zirgen/dsl/examples/calculator/main.rs
index 9bf424af..d489d711 100644
--- a/zirgen/dsl/examples/calculator/main.rs
+++ b/zirgen/dsl/examples/calculator/main.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 //! Performs a simple test of 123 + 456 using the generated code for the calculator circuit.
 mod cpu;
diff --git a/zirgen/dsl/lexer.cpp b/zirgen/dsl/lexer.cpp
index cf5b218c..e2b94844 100644
--- a/zirgen/dsl/lexer.cpp
+++ b/zirgen/dsl/lexer.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <unordered_map>
 
diff --git a/zirgen/dsl/lexer.h b/zirgen/dsl/lexer.h
index f75f5a8b..0cf4371e 100644
--- a/zirgen/dsl/lexer.h
+++ b/zirgen/dsl/lexer.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/lower.cpp b/zirgen/dsl/lower.cpp
index 5dd99885..e41dbbcf 100644
--- a/zirgen/dsl/lower.cpp
+++ b/zirgen/dsl/lower.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "lower.h"
 #include "zirgen/Dialect/ZHL/IR/ZHL.h"
diff --git a/zirgen/dsl/lower.h b/zirgen/dsl/lower.h
index c80dc284..db660ebc 100644
--- a/zirgen/dsl/lower.h
+++ b/zirgen/dsl/lower.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/parser.cpp b/zirgen/dsl/parser.cpp
index 6785b941..b7ae990c 100644
--- a/zirgen/dsl/parser.cpp
+++ b/zirgen/dsl/parser.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/parser.h"
 
diff --git a/zirgen/dsl/parser.h b/zirgen/dsl/parser.h
index f24ad8fd..b93e6453 100644
--- a/zirgen/dsl/parser.h
+++ b/zirgen/dsl/parser.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/passes/CommonRewrites.cpp b/zirgen/dsl/passes/CommonRewrites.cpp
index 4d9065eb..852ef9ff 100644
--- a/zirgen/dsl/passes/CommonRewrites.cpp
+++ b/zirgen/dsl/passes/CommonRewrites.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/passes/CommonRewrites.h"
 
diff --git a/zirgen/dsl/passes/CommonRewrites.h b/zirgen/dsl/passes/CommonRewrites.h
index 1b0fffe4..2e2c470f 100644
--- a/zirgen/dsl/passes/CommonRewrites.h
+++ b/zirgen/dsl/passes/CommonRewrites.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/IRMapping.h"
 #include "mlir/IR/PatternMatch.h"
diff --git a/zirgen/dsl/passes/ElideTrivialStructs.cpp b/zirgen/dsl/passes/ElideTrivialStructs.cpp
index 945d0cdc..03088a11 100644
--- a/zirgen/dsl/passes/ElideTrivialStructs.cpp
+++ b/zirgen/dsl/passes/ElideTrivialStructs.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "llvm/ADT/TypeSwitch.h"
diff --git a/zirgen/dsl/passes/GenerateAccum.cpp b/zirgen/dsl/passes/GenerateAccum.cpp
index 580e91ab..be66188a 100644
--- a/zirgen/dsl/passes/GenerateAccum.cpp
+++ b/zirgen/dsl/passes/GenerateAccum.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "llvm/ADT/TypeSwitch.h"
diff --git a/zirgen/dsl/passes/GenerateGlobals.cpp b/zirgen/dsl/passes/GenerateGlobals.cpp
index 0739e1dc..093fa767 100644
--- a/zirgen/dsl/passes/GenerateGlobals.cpp
+++ b/zirgen/dsl/passes/GenerateGlobals.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZHLT/IR/TypeUtils.h"
 #include "zirgen/Dialect/ZHLT/IR/ZHLT.h"
diff --git a/zirgen/dsl/passes/GenerateLayout.cpp b/zirgen/dsl/passes/GenerateLayout.cpp
index 2665d8fb..3cc8d2d8 100644
--- a/zirgen/dsl/passes/GenerateLayout.cpp
+++ b/zirgen/dsl/passes/GenerateLayout.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
diff --git a/zirgen/dsl/passes/GenerateTaps.cpp b/zirgen/dsl/passes/GenerateTaps.cpp
index f1213d79..f6145629 100644
--- a/zirgen/dsl/passes/GenerateTaps.cpp
+++ b/zirgen/dsl/passes/GenerateTaps.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/Transforms/DialectConversion.h"
 #include "llvm/ADT/TypeSwitch.h"
diff --git a/zirgen/dsl/passes/PassDetail.h b/zirgen/dsl/passes/PassDetail.h
index 0bc26f38..77900fa8 100644
--- a/zirgen/dsl/passes/PassDetail.h
+++ b/zirgen/dsl/passes/PassDetail.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/passes/Passes.h b/zirgen/dsl/passes/Passes.h
index 62df0d2f..25a396d9 100644
--- a/zirgen/dsl/passes/Passes.h
+++ b/zirgen/dsl/passes/Passes.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once
 
diff --git a/zirgen/dsl/passes/Passes.td b/zirgen/dsl/passes/Passes.td
index 44710a34..f7b681ba 100644
--- a/zirgen/dsl/passes/Passes.td
+++ b/zirgen/dsl/passes/Passes.td
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 #ifndef ZIRGEN_PASSES
 #define ZIRGEN_PASSES
 
diff --git a/zirgen/dsl/passes/SemanticLowering.cpp b/zirgen/dsl/passes/SemanticLowering.cpp
index 4fa18e2b..333dc3d9 100644
--- a/zirgen/dsl/passes/SemanticLowering.cpp
+++ b/zirgen/dsl/passes/SemanticLowering.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include <functional>
 
diff --git a/zirgen/dsl/recognizer/zirgen.l b/zirgen/dsl/recognizer/zirgen.l
index 5608fe8e..7c8bb379 100644
--- a/zirgen/dsl/recognizer/zirgen.l
+++ b/zirgen/dsl/recognizer/zirgen.l
@@ -1,3 +1,19 @@
+/*
+Copyright 2024 RISC Zero, Inc.
+
+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.
+*/
+
 %{
     #include <stdio.h>
     #include "zirgen.tab.h"
diff --git a/zirgen/dsl/recognizer/zirgen.y b/zirgen/dsl/recognizer/zirgen.y
index aeb11f6b..9a9e50b0 100644
--- a/zirgen/dsl/recognizer/zirgen.y
+++ b/zirgen/dsl/recognizer/zirgen.y
@@ -1,3 +1,17 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// 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.
+
 %token ANGLE_L
 %token ANGLE_R
 %token BACK
diff --git a/zirgen/dsl/src/buffers.rs b/zirgen/dsl/src/buffers.rs
index a52d661b..727f7a8d 100644
--- a/zirgen/dsl/src/buffers.rs
+++ b/zirgen/dsl/src/buffers.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 /// Metadata about buffers.
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
diff --git a/zirgen/dsl/src/codegen/_support.rs b/zirgen/dsl/src/codegen/_support.rs
index 423b1a04..c1d2871d 100644
--- a/zirgen/dsl/src/codegen/_support.rs
+++ b/zirgen/dsl/src/codegen/_support.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // TODO: First pass, lots of cleanup to be done here!
 
diff --git a/zirgen/dsl/src/codegen/_support_macros.rs b/zirgen/dsl/src/codegen/_support_macros.rs
index 7da61328..56eda258 100644
--- a/zirgen/dsl/src/codegen/_support_macros.rs
+++ b/zirgen/dsl/src/codegen/_support_macros.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 // Macros used by code generation.  They all start with "codegen_" to
 // minimimze namespace pollution since they appear in the top of the
diff --git a/zirgen/dsl/src/codegen/mod.rs b/zirgen/dsl/src/codegen/mod.rs
index d179c9ee..f93ce294 100644
--- a/zirgen/dsl/src/codegen/mod.rs
+++ b/zirgen/dsl/src/codegen/mod.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 /// Support for generated code.  Not intended for public use; only
 /// marked "pub" so that it's accessible by macros defined here.
diff --git a/zirgen/dsl/src/codegen/taps.rs b/zirgen/dsl/src/codegen/taps.rs
index 0e90d472..6d29e189 100644
--- a/zirgen/dsl/src/codegen/taps.rs
+++ b/zirgen/dsl/src/codegen/taps.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use risc0_zkp::taps::{TapData, TapSet};
 use std::collections::{BTreeMap, BTreeSet};
diff --git a/zirgen/dsl/src/cpu.rs b/zirgen/dsl/src/cpu.rs
index f702e59a..d00b8bfe 100644
--- a/zirgen/dsl/src/cpu.rs
+++ b/zirgen/dsl/src/cpu.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 use crate::{BufferRow, Buffers};
 use anyhow::Result;
diff --git a/zirgen/dsl/src/lib.rs b/zirgen/dsl/src/lib.rs
index 6c752ed3..724298f3 100644
--- a/zirgen/dsl/src/lib.rs
+++ b/zirgen/dsl/src/lib.rs
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #[macro_use]
 pub mod codegen;
diff --git a/zirgen/dsl/stats.cpp b/zirgen/dsl/stats.cpp
index acb6ffbc..70ba6fc0 100644
--- a/zirgen/dsl/stats.cpp
+++ b/zirgen/dsl/stats.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/stats.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
diff --git a/zirgen/dsl/stats.h b/zirgen/dsl/stats.h
index b9a64d33..a5c4c70c 100644
--- a/zirgen/dsl/stats.h
+++ b/zirgen/dsl/stats.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/BuiltinOps.h"
 
diff --git a/zirgen/dsl/test/ast.cpp b/zirgen/dsl/test/ast.cpp
index 5093859f..8c910325 100644
--- a/zirgen/dsl/test/ast.cpp
+++ b/zirgen/dsl/test/ast.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/ast.h"
 #include "zirgen/dsl/test/utils.h"
diff --git a/zirgen/dsl/test/generate_layout.cpp b/zirgen/dsl/test/generate_layout.cpp
index 5800e19e..868542b8 100644
--- a/zirgen/dsl/test/generate_layout.cpp
+++ b/zirgen/dsl/test/generate_layout.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/Dialect/ZStruct/IR/TypeUtils.h"
 #include "zirgen/dsl/Analysis/LayoutDAGAnalysis.h"
diff --git a/zirgen/dsl/test/lower.cpp b/zirgen/dsl/test/lower.cpp
index 5733a4cb..7b0dabae 100644
--- a/zirgen/dsl/test/lower.cpp
+++ b/zirgen/dsl/test/lower.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/lower.h"
 #include "zirgen/Dialect/ZHL/IR/ZHL.h"
diff --git a/zirgen/dsl/test/parser.cpp b/zirgen/dsl/test/parser.cpp
index 5cac353d..0ecd74e2 100644
--- a/zirgen/dsl/test/parser.cpp
+++ b/zirgen/dsl/test/parser.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/parser.h"
 #include "zirgen/dsl/test/utils.h"
diff --git a/zirgen/dsl/test/types.cpp b/zirgen/dsl/test/types.cpp
index 8b656779..980138fc 100644
--- a/zirgen/dsl/test/types.cpp
+++ b/zirgen/dsl/test/types.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "mlir/IR/MLIRContext.h"
 #include "zirgen/Dialect/ZHLT/IR/TypeUtils.h"
diff --git a/zirgen/dsl/test/utils.cpp b/zirgen/dsl/test/utils.cpp
index a4160453..69f2b433 100644
--- a/zirgen/dsl/test/utils.cpp
+++ b/zirgen/dsl/test/utils.cpp
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #include "zirgen/dsl/test/utils.h"
 
diff --git a/zirgen/dsl/test/utils.h b/zirgen/dsl/test/utils.h
index 6661e6e4..1e1d9fb9 100644
--- a/zirgen/dsl/test/utils.h
+++ b/zirgen/dsl/test/utils.h
@@ -1,6 +1,16 @@
-// Copyright (c) 2024 RISC Zero, Inc.
+// Copyright 2024 RISC Zero, Inc.
 //
-// All rights reserved.
+// 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.
 
 #pragma once