diff --git a/.copywrite.hcl b/.copywrite.hcl
index 3fc838c..c1b514f 100644
--- a/.copywrite.hcl
+++ b/.copywrite.hcl
@@ -1,4 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2023, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 schema_version = 1
diff --git a/LICENSE b/LICENSE
index 3f64392..65cd330 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023 HashiCorp, Inc.
+Copyright IBM Corp. 2023, 2025
 
 Mozilla Public License, version 2.0
 
diff --git a/common.go b/common.go
index 8c161e5..8ce7e52 100644
--- a/common.go
+++ b/common.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/common_test.go b/common_test.go
index 5a3edad..b680672 100644
--- a/common_test.go
+++ b/common_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/docker-compose.yml b/docker-compose.yml
index f8912d6..2136b39 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2023, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 version: '3'
diff --git a/docs.go b/docs.go
index c347670..f30768d 100644
--- a/docs.go
+++ b/docs.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package mql provides a language that end users can use to query your
diff --git a/error.go b/error.go
index 9ef164e..ba5f7ca 100644
--- a/error.go
+++ b/error.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/expr.go b/expr.go
index 6dacf56..a6fc9b5 100644
--- a/expr.go
+++ b/expr.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/expr_test.go b/expr_test.go
index 8727423..0b3d8bd 100644
--- a/expr_test.go
+++ b/expr_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/lex.go b/lex.go
index f0038c2..d5dcd9c 100644
--- a/lex.go
+++ b/lex.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/lex_test.go b/lex_test.go
index bbca182..93ccc4f 100644
--- a/lex_test.go
+++ b/lex_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/mql.go b/mql.go
index 68b16a6..102a277 100644
--- a/mql.go
+++ b/mql.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/mql_test.go b/mql_test.go
index 708c9f2..6039a83 100644
--- a/mql_test.go
+++ b/mql_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql_test
diff --git a/mql_unexported_test.go b/mql_unexported_test.go
index 36e33ff..1be6994 100644
--- a/mql_unexported_test.go
+++ b/mql_unexported_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/options.go b/options.go
index b71d3d9..7a9f800 100644
--- a/options.go
+++ b/options.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/parser.go b/parser.go
index 3625c5e..4cb70b7 100644
--- a/parser.go
+++ b/parser.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/parser_test.go b/parser_test.go
index 479689d..d12bada 100644
--- a/parser_test.go
+++ b/parser_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/stack.go b/stack.go
index 8617f9d..31818c2 100644
--- a/stack.go
+++ b/stack.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/tests/postgres/postgres_test.go b/tests/postgres/postgres_test.go
index 667b728..68bb49e 100644
--- a/tests/postgres/postgres_test.go
+++ b/tests/postgres/postgres_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package postgres
diff --git a/tests/postgres/testing.go b/tests/postgres/testing.go
index aa2bb59..e8f11d6 100644
--- a/tests/postgres/testing.go
+++ b/tests/postgres/testing.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package postgres
diff --git a/token.go b/token.go
index 0db754c..0275cf7 100644
--- a/token.go
+++ b/token.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/token_test.go b/token_test.go
index c1e5bf7..900cb75 100644
--- a/token_test.go
+++ b/token_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql
diff --git a/tools/tools.go b/tools/tools.go
index 5446130..7ad1d65 100644
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 //go:build tools
diff --git a/validate.go b/validate.go
index 553a62e..ea77dcb 100644
--- a/validate.go
+++ b/validate.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2023, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package mql