diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c88afc066..08fc44920 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,7 +2,7 @@
 # More on CODEOWNERS files: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
 # Default owner
-* @hashicorp/team-ip-compliance @hashicorp/terraform-core
+* @hashicorp/terraform-core
 
 # Add override rules below. Each line is a file/folder pattern followed by one or more owners.
 # Being an owner means those groups or individuals will be added as reviewers to PRs affecting
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 0b3023dd1..baf949a7f 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -30,16 +30,16 @@ jobs:
         run: |
           git config --global core.autocrlf false
       - name: "Fetch source code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version-file: go.mod
       - name: Go test
         run: |
           go test -v -race -coverprofile="coverage.out" ./... -coverpkg=./...
       - name: Upload coverage report
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           path: coverage.out
           name: coverage-report-${{matrix.target}}
@@ -52,9 +52,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Fetch source code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version: "1.23"
       - name: "copyright headers check"
@@ -66,9 +66,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Fetch source code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version-file: go.mod
       - name: "go vet"
@@ -80,9 +80,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Fetch source code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version-file: go.mod
       - name: "gofmt"
@@ -94,10 +94,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Fetch source code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version-file: go.mod
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        uses: golangci/golangci-lint-action@e7fa5ac41e1cf5b7d48e45e42232ce7ada589601 # v9.1.0
diff --git a/.golangci.yaml b/.golangci.yaml
index 719498be6..33c865b3f 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2014, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 version: "2"
diff --git a/cmd/hcldec/diags_json.go b/cmd/hcldec/diags_json.go
index 7b4ed6748..a5c43de78 100644
--- a/cmd/hcldec/diags_json.go
+++ b/cmd/hcldec/diags_json.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hcldec/examples/sh-config-file/example.sh b/cmd/hcldec/examples/sh-config-file/example.sh
index 4544c2683..66d704b2c 100755
--- a/cmd/hcldec/examples/sh-config-file/example.sh
+++ b/cmd/hcldec/examples/sh-config-file/example.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2014, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 
diff --git a/cmd/hcldec/main.go b/cmd/hcldec/main.go
index ba3b895e8..2079c1546 100644
--- a/cmd/hcldec/main.go
+++ b/cmd/hcldec/main.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hcldec/spec.go b/cmd/hcldec/spec.go
index a011d1c9c..bba52f88c 100644
--- a/cmd/hcldec/spec.go
+++ b/cmd/hcldec/spec.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hcldec/spec_funcs.go b/cmd/hcldec/spec_funcs.go
index f7bdaf082..90d81de88 100644
--- a/cmd/hcldec/spec_funcs.go
+++ b/cmd/hcldec/spec_funcs.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hcldec/type_expr.go b/cmd/hcldec/type_expr.go
index ed838d708..b0e8420ce 100644
--- a/cmd/hcldec/type_expr.go
+++ b/cmd/hcldec/type_expr.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hcldec/vars.go b/cmd/hcldec/vars.go
index cf70136dc..528596dd1 100644
--- a/cmd/hcldec/vars.go
+++ b/cmd/hcldec/vars.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclfmt/main.go b/cmd/hclfmt/main.go
index 91b44b2f1..f1e5721cf 100644
--- a/cmd/hclfmt/main.go
+++ b/cmd/hclfmt/main.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclspecsuite/diagnostics.go b/cmd/hclspecsuite/diagnostics.go
index 97eb1df75..b6ec2c930 100644
--- a/cmd/hclspecsuite/diagnostics.go
+++ b/cmd/hclspecsuite/diagnostics.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclspecsuite/log.go b/cmd/hclspecsuite/log.go
index b31937b21..003eb4cc4 100644
--- a/cmd/hclspecsuite/log.go
+++ b/cmd/hclspecsuite/log.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclspecsuite/main.go b/cmd/hclspecsuite/main.go
index 3aa7e370a..0c90fe97f 100644
--- a/cmd/hclspecsuite/main.go
+++ b/cmd/hclspecsuite/main.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclspecsuite/runner.go b/cmd/hclspecsuite/runner.go
index cb1e7625d..d52a2ff82 100644
--- a/cmd/hclspecsuite/runner.go
+++ b/cmd/hclspecsuite/runner.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclspecsuite/test_file.go b/cmd/hclspecsuite/test_file.go
index 8268042a3..a17f54277 100644
--- a/cmd/hclspecsuite/test_file.go
+++ b/cmd/hclspecsuite/test_file.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/cmd/hclspecsuite/traversals.go b/cmd/hclspecsuite/traversals.go
index 8a8a94438..4d04cc22a 100644
--- a/cmd/hclspecsuite/traversals.go
+++ b/cmd/hclspecsuite/traversals.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package main
diff --git a/diagnostic.go b/diagnostic.go
index a61bb3066..00d786452 100644
--- a/diagnostic.go
+++ b/diagnostic.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/diagnostic_text.go b/diagnostic_text.go
index 294eb1848..7d3d727d3 100644
--- a/diagnostic_text.go
+++ b/diagnostic_text.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/diagnostic_text_test.go b/diagnostic_text_test.go
index 1057998a4..b9a6e1566 100644
--- a/diagnostic_text_test.go
+++ b/diagnostic_text_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/diagnostic_typeparams.go b/diagnostic_typeparams.go
index 92be8f1a8..9ead42280 100644
--- a/diagnostic_typeparams.go
+++ b/diagnostic_typeparams.go
@@ -1,8 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 //go:build go1.18
-// +build go1.18
 
 package hcl
 
diff --git a/didyoumean.go b/didyoumean.go
index fd00ca6f6..34473d8bb 100644
--- a/didyoumean.go
+++ b/didyoumean.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/doc.go b/doc.go
index 665ad6cad..b22119b99 100644
--- a/doc.go
+++ b/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hcl contains the main modelling types and general utility functions
diff --git a/eval_context.go b/eval_context.go
index 921cfcb42..71452720e 100644
--- a/eval_context.go
+++ b/eval_context.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/expr_call.go b/expr_call.go
index ca59b90d2..c89bab6af 100644
--- a/expr_call.go
+++ b/expr_call.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/expr_list.go b/expr_list.go
index 8c0cf4051..ac736395d 100644
--- a/expr_list.go
+++ b/expr_list.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/expr_map.go b/expr_map.go
index 56cf97474..e65e0434b 100644
--- a/expr_map.go
+++ b/expr_map.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/expr_unwrap.go b/expr_unwrap.go
index 6683fd544..412b301e4 100644
--- a/expr_unwrap.go
+++ b/expr_unwrap.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/ext/customdecode/customdecode.go b/ext/customdecode/customdecode.go
index e0dda0df9..69698add9 100644
--- a/ext/customdecode/customdecode.go
+++ b/ext/customdecode/customdecode.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package customdecode contains a HCL extension that allows, in certain
diff --git a/ext/customdecode/expression_type.go b/ext/customdecode/expression_type.go
index 2477f2190..64f04965c 100644
--- a/ext/customdecode/expression_type.go
+++ b/ext/customdecode/expression_type.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package customdecode
diff --git a/ext/dynblock/expand_body.go b/ext/dynblock/expand_body.go
index 2cafae5f4..788e49ecf 100644
--- a/ext/dynblock/expand_body.go
+++ b/ext/dynblock/expand_body.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/expand_body_test.go b/ext/dynblock/expand_body_test.go
index 0941f291e..1543b8067 100644
--- a/ext/dynblock/expand_body_test.go
+++ b/ext/dynblock/expand_body_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/expand_spec.go b/ext/dynblock/expand_spec.go
index 55a69ba9c..11a3b0c03 100644
--- a/ext/dynblock/expand_spec.go
+++ b/ext/dynblock/expand_spec.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/expr_wrap.go b/ext/dynblock/expr_wrap.go
index 576364118..f5ba635cc 100644
--- a/ext/dynblock/expr_wrap.go
+++ b/ext/dynblock/expr_wrap.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/iteration.go b/ext/dynblock/iteration.go
index 9e811a489..135448814 100644
--- a/ext/dynblock/iteration.go
+++ b/ext/dynblock/iteration.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/options.go b/ext/dynblock/options.go
index 82d858651..586216929 100644
--- a/ext/dynblock/options.go
+++ b/ext/dynblock/options.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/public.go b/ext/dynblock/public.go
index 79b6144c5..824835611 100644
--- a/ext/dynblock/public.go
+++ b/ext/dynblock/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package dynblock provides an extension to HCL that allows dynamic
diff --git a/ext/dynblock/schema.go b/ext/dynblock/schema.go
index 026008bdd..35857b611 100644
--- a/ext/dynblock/schema.go
+++ b/ext/dynblock/schema.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/unknown_body.go b/ext/dynblock/unknown_body.go
index b1fdfc07d..d12449ff8 100644
--- a/ext/dynblock/unknown_body.go
+++ b/ext/dynblock/unknown_body.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/variables.go b/ext/dynblock/variables.go
index 4aa2faa82..731175d3a 100644
--- a/ext/dynblock/variables.go
+++ b/ext/dynblock/variables.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/variables_hcldec.go b/ext/dynblock/variables_hcldec.go
index caaf9df43..cbe0bcc2b 100644
--- a/ext/dynblock/variables_hcldec.go
+++ b/ext/dynblock/variables_hcldec.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/dynblock/variables_test.go b/ext/dynblock/variables_test.go
index ee8adaa9c..599f53536 100644
--- a/ext/dynblock/variables_test.go
+++ b/ext/dynblock/variables_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package dynblock
diff --git a/ext/transform/doc.go b/ext/transform/doc.go
index 6744467a8..77f5ce864 100644
--- a/ext/transform/doc.go
+++ b/ext/transform/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package transform is a helper package for writing extensions that work
diff --git a/ext/transform/error.go b/ext/transform/error.go
index 38e064b80..9e86dea1b 100644
--- a/ext/transform/error.go
+++ b/ext/transform/error.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package transform
diff --git a/ext/transform/transform.go b/ext/transform/transform.go
index 035044e4b..b9ea3d1c7 100644
--- a/ext/transform/transform.go
+++ b/ext/transform/transform.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package transform
diff --git a/ext/transform/transform_test.go b/ext/transform/transform_test.go
index 3c0ea7b30..6755c67f7 100644
--- a/ext/transform/transform_test.go
+++ b/ext/transform/transform_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package transform
diff --git a/ext/transform/transformer.go b/ext/transform/transformer.go
index 511d0a290..371ab1688 100644
--- a/ext/transform/transformer.go
+++ b/ext/transform/transformer.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package transform
diff --git a/ext/tryfunc/tryfunc.go b/ext/tryfunc/tryfunc.go
index fa601da4b..9e9c72b9a 100644
--- a/ext/tryfunc/tryfunc.go
+++ b/ext/tryfunc/tryfunc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package tryfunc contains some optional functions that can be exposed in
diff --git a/ext/tryfunc/tryfunc_test.go b/ext/tryfunc/tryfunc_test.go
index 7bd7af6dd..0092879c3 100644
--- a/ext/tryfunc/tryfunc_test.go
+++ b/ext/tryfunc/tryfunc_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package tryfunc
diff --git a/ext/typeexpr/defaults.go b/ext/typeexpr/defaults.go
index d3d6be29c..102ced693 100644
--- a/ext/typeexpr/defaults.go
+++ b/ext/typeexpr/defaults.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/defaults_test.go b/ext/typeexpr/defaults_test.go
index dc3a3f42e..de3152bf2 100644
--- a/ext/typeexpr/defaults_test.go
+++ b/ext/typeexpr/defaults_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/doc.go b/ext/typeexpr/doc.go
index a5a3a8e1b..26c247827 100644
--- a/ext/typeexpr/doc.go
+++ b/ext/typeexpr/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package typeexpr extends HCL with a convention for describing HCL types
diff --git a/ext/typeexpr/get_type.go b/ext/typeexpr/get_type.go
index 8535933f8..cc1788208 100644
--- a/ext/typeexpr/get_type.go
+++ b/ext/typeexpr/get_type.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/get_type_test.go b/ext/typeexpr/get_type_test.go
index 7def03585..ba87f23d2 100644
--- a/ext/typeexpr/get_type_test.go
+++ b/ext/typeexpr/get_type_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/public.go b/ext/typeexpr/public.go
index e03631d3b..fd528d7b1 100644
--- a/ext/typeexpr/public.go
+++ b/ext/typeexpr/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/type_string_test.go b/ext/typeexpr/type_string_test.go
index d9a52404d..591261367 100644
--- a/ext/typeexpr/type_string_test.go
+++ b/ext/typeexpr/type_string_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/type_type.go b/ext/typeexpr/type_type.go
index d86d1f893..583371abe 100644
--- a/ext/typeexpr/type_type.go
+++ b/ext/typeexpr/type_type.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/typeexpr/type_type_test.go b/ext/typeexpr/type_type_test.go
index 328ead6d1..27bdc3417 100644
--- a/ext/typeexpr/type_type_test.go
+++ b/ext/typeexpr/type_type_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package typeexpr
diff --git a/ext/userfunc/decode.go b/ext/userfunc/decode.go
index 3f3c533e2..75cac6d41 100644
--- a/ext/userfunc/decode.go
+++ b/ext/userfunc/decode.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package userfunc
diff --git a/ext/userfunc/decode_test.go b/ext/userfunc/decode_test.go
index 60841b21e..177b83e27 100644
--- a/ext/userfunc/decode_test.go
+++ b/ext/userfunc/decode_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package userfunc
diff --git a/ext/userfunc/doc.go b/ext/userfunc/doc.go
index 7bc2d7e1d..0f8f0eb04 100644
--- a/ext/userfunc/doc.go
+++ b/ext/userfunc/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package userfunc implements a HCL extension that allows user-defined
diff --git a/ext/userfunc/public.go b/ext/userfunc/public.go
index 8e6c9bfb8..d2b292599 100644
--- a/ext/userfunc/public.go
+++ b/ext/userfunc/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package userfunc
diff --git a/go.mod b/go.mod
index 680039026..b054bdf87 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/hcl/v2
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/agext/levenshtein v1.2.1
@@ -12,14 +12,13 @@ require (
 	github.com/spf13/pflag v1.0.2
 	github.com/zclconf/go-cty v1.16.3
 	github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940
-	golang.org/x/crypto v0.38.0
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
+	golang.org/x/term v0.37.0
+	golang.org/x/tools v0.38.0
 )
 
 require (
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 )
diff --git a/go.sum b/go.sum
index d5a1483ff..55248602f 100644
--- a/go.sum
+++ b/go.sum
@@ -16,17 +16,15 @@ github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk
 github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
diff --git a/gohcl/decode.go b/gohcl/decode.go
index b3ba8e8a6..583217264 100644
--- a/gohcl/decode.go
+++ b/gohcl/decode.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl
diff --git a/gohcl/decode_test.go b/gohcl/decode_test.go
index 358183188..f871239aa 100644
--- a/gohcl/decode_test.go
+++ b/gohcl/decode_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl
diff --git a/gohcl/doc.go b/gohcl/doc.go
index 73b7045a1..7c648202f 100644
--- a/gohcl/doc.go
+++ b/gohcl/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package gohcl allows decoding HCL configurations into Go data structures.
diff --git a/gohcl/encode.go b/gohcl/encode.go
index 64cb2d1ec..8e92909c5 100644
--- a/gohcl/encode.go
+++ b/gohcl/encode.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl
diff --git a/gohcl/encode_test.go b/gohcl/encode_test.go
index a75bf28ba..a3fcd186a 100644
--- a/gohcl/encode_test.go
+++ b/gohcl/encode_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl_test
diff --git a/gohcl/schema.go b/gohcl/schema.go
index d0c18881d..ddb755484 100644
--- a/gohcl/schema.go
+++ b/gohcl/schema.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl
diff --git a/gohcl/schema_test.go b/gohcl/schema_test.go
index ca8c0ec15..4e6b757a9 100644
--- a/gohcl/schema_test.go
+++ b/gohcl/schema_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl
diff --git a/gohcl/types.go b/gohcl/types.go
index ec0f9ea22..946bc6541 100644
--- a/gohcl/types.go
+++ b/gohcl/types.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package gohcl
diff --git a/hcldec/block_labels.go b/hcldec/block_labels.go
index 9e6f1f2ce..fb228b900 100644
--- a/hcldec/block_labels.go
+++ b/hcldec/block_labels.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/decode.go b/hcldec/decode.go
index 5f86e67f1..7df2f7ea9 100644
--- a/hcldec/decode.go
+++ b/hcldec/decode.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/doc.go b/hcldec/doc.go
index c84394010..b9e92cf24 100644
--- a/hcldec/doc.go
+++ b/hcldec/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hcldec provides a higher-level API for unpacking the content of
diff --git a/hcldec/gob.go b/hcldec/gob.go
index 27e9be2ee..edf0a951b 100644
--- a/hcldec/gob.go
+++ b/hcldec/gob.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/public.go b/hcldec/public.go
index ff1e5fe95..b13bb75cd 100644
--- a/hcldec/public.go
+++ b/hcldec/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/public_test.go b/hcldec/public_test.go
index 0087c0512..9a6c42593 100644
--- a/hcldec/public_test.go
+++ b/hcldec/public_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/schema.go b/hcldec/schema.go
index 8a9fa4fea..89058a947 100644
--- a/hcldec/schema.go
+++ b/hcldec/schema.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/spec.go b/hcldec/spec.go
index b297c32b8..d40f81c4c 100644
--- a/hcldec/spec.go
+++ b/hcldec/spec.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/spec_test.go b/hcldec/spec_test.go
index a88066b51..1d5007581 100644
--- a/hcldec/spec_test.go
+++ b/hcldec/spec_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/variables.go b/hcldec/variables.go
index c5ac1744c..f5012fcb4 100644
--- a/hcldec/variables.go
+++ b/hcldec/variables.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcldec/variables_test.go b/hcldec/variables_test.go
index 10412deba..4cfc6ac4b 100644
--- a/hcldec/variables_test.go
+++ b/hcldec/variables_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcldec
diff --git a/hcled/doc.go b/hcled/doc.go
index 51b335a12..1b1e2d7a5 100644
--- a/hcled/doc.go
+++ b/hcled/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hcled provides functionality intended to help an application
diff --git a/hcled/navigation.go b/hcled/navigation.go
index 859356961..defefc49f 100644
--- a/hcled/navigation.go
+++ b/hcled/navigation.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcled
diff --git a/hclparse/parser.go b/hclparse/parser.go
index f36456490..c5e450e8b 100644
--- a/hclparse/parser.go
+++ b/hclparse/parser.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hclparse has the main API entry point for parsing both HCL native
diff --git a/hclsimple/hclsimple.go b/hclsimple/hclsimple.go
index 5a8a482db..488579407 100644
--- a/hclsimple/hclsimple.go
+++ b/hclsimple/hclsimple.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hclsimple is a higher-level entry point for loading HCL
diff --git a/hclsimple/hclsimple_test.go b/hclsimple/hclsimple_test.go
index 034edd537..5d53d254a 100644
--- a/hclsimple/hclsimple_test.go
+++ b/hclsimple/hclsimple_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsimple_test
diff --git a/hclsimple/testdata/test.hcl b/hclsimple/testdata/test.hcl
index ee5360361..8d6748fb9 100644
--- a/hclsimple/testdata/test.hcl
+++ b/hclsimple/testdata/test.hcl
@@ -1,4 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2014, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 foo = "bar"
diff --git a/hclsyntax/diagnostics.go b/hclsyntax/diagnostics.go
index 43689d740..be5548ac9 100644
--- a/hclsyntax/diagnostics.go
+++ b/hclsyntax/diagnostics.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/didyoumean.go b/hclsyntax/didyoumean.go
index 5b0e46810..ce06a7491 100644
--- a/hclsyntax/didyoumean.go
+++ b/hclsyntax/didyoumean.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/didyoumean_test.go b/hclsyntax/didyoumean_test.go
index 84cfed6d9..a2a40fbf1 100644
--- a/hclsyntax/didyoumean_test.go
+++ b/hclsyntax/didyoumean_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/doc.go b/hclsyntax/doc.go
index defe3dbb7..0746b3b05 100644
--- a/hclsyntax/doc.go
+++ b/hclsyntax/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hclsyntax contains the parser, AST, etc for HCL's native language,
diff --git a/hclsyntax/expression.go b/hclsyntax/expression.go
index c5a448863..4d247aa16 100644
--- a/hclsyntax/expression.go
+++ b/hclsyntax/expression.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_ops.go b/hclsyntax/expression_ops.go
index da146ef83..f93909fa3 100644
--- a/hclsyntax/expression_ops.go
+++ b/hclsyntax/expression_ops.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_static_test.go b/hclsyntax/expression_static_test.go
index f56bb6f19..3b24383a2 100644
--- a/hclsyntax/expression_static_test.go
+++ b/hclsyntax/expression_static_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_template.go b/hclsyntax/expression_template.go
index 5713c004d..6952c3494 100644
--- a/hclsyntax/expression_template.go
+++ b/hclsyntax/expression_template.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_template_test.go b/hclsyntax/expression_template_test.go
index 92c11afea..c691637b5 100644
--- a/hclsyntax/expression_template_test.go
+++ b/hclsyntax/expression_template_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_test.go b/hclsyntax/expression_test.go
index 8fd355f7f..ff32eefcd 100644
--- a/hclsyntax/expression_test.go
+++ b/hclsyntax/expression_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_typeparams_test.go b/hclsyntax/expression_typeparams_test.go
index c7fdbd22b..bef3b476d 100644
--- a/hclsyntax/expression_typeparams_test.go
+++ b/hclsyntax/expression_typeparams_test.go
@@ -1,8 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 //go:build go1.18
-// +build go1.18
 
 package hclsyntax
 
diff --git a/hclsyntax/expression_vars.go b/hclsyntax/expression_vars.go
index 6c3e472ca..669856e4a 100755
--- a/hclsyntax/expression_vars.go
+++ b/hclsyntax/expression_vars.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/expression_vars_gen.go b/hclsyntax/expression_vars_gen.go
index d08880253..05a984d85 100644
--- a/hclsyntax/expression_vars_gen.go
+++ b/hclsyntax/expression_vars_gen.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // This is a 'go generate'-oriented program for producing the "Variables"
@@ -8,7 +8,6 @@
 // to do its work.
 
 //go:build ignore
-// +build ignore
 
 package main
 
@@ -87,7 +86,7 @@ func main() {
 
 }
 
-const outputPreamble = `// Copyright (c) HashiCorp, Inc.
+const outputPreamble = `// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/file.go b/hclsyntax/file.go
index 7be626ffd..d94924b91 100644
--- a/hclsyntax/file.go
+++ b/hclsyntax/file.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/fuzz/fuzz_test.go b/hclsyntax/fuzz/fuzz_test.go
index 4aaee5d09..6b8e52bef 100644
--- a/hclsyntax/fuzz/fuzz_test.go
+++ b/hclsyntax/fuzz/fuzz_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package fuzzhclsyntax
diff --git a/hclsyntax/generate.go b/hclsyntax/generate.go
index 66486074c..6d8b23594 100644
--- a/hclsyntax/generate.go
+++ b/hclsyntax/generate.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/keywords.go b/hclsyntax/keywords.go
index 5124ae95c..4299e3a5a 100644
--- a/hclsyntax/keywords.go
+++ b/hclsyntax/keywords.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/navigation.go b/hclsyntax/navigation.go
index 83e1d4efb..46cd40ec0 100644
--- a/hclsyntax/navigation.go
+++ b/hclsyntax/navigation.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/navigation_test.go b/hclsyntax/navigation_test.go
index 121873981..9633a80e3 100644
--- a/hclsyntax/navigation_test.go
+++ b/hclsyntax/navigation_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/node.go b/hclsyntax/node.go
index 6ead6091c..f633d12ef 100644
--- a/hclsyntax/node.go
+++ b/hclsyntax/node.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/parse_traversal_test.go b/hclsyntax/parse_traversal_test.go
index 5d8d24ea1..8d5cbccf0 100644
--- a/hclsyntax/parse_traversal_test.go
+++ b/hclsyntax/parse_traversal_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/parser.go b/hclsyntax/parser.go
index fec7861a2..2234c219b 100644
--- a/hclsyntax/parser.go
+++ b/hclsyntax/parser.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/parser_template.go b/hclsyntax/parser_template.go
index 19e988064..fdf480218 100644
--- a/hclsyntax/parser_template.go
+++ b/hclsyntax/parser_template.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/parser_test.go b/hclsyntax/parser_test.go
index ba53ac4ce..1510529ff 100644
--- a/hclsyntax/parser_test.go
+++ b/hclsyntax/parser_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/parser_traversal.go b/hclsyntax/parser_traversal.go
index f7d4062f0..b2ac298b8 100644
--- a/hclsyntax/parser_traversal.go
+++ b/hclsyntax/parser_traversal.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/peeker.go b/hclsyntax/peeker.go
index 74fa3fb33..ebf4a2230 100644
--- a/hclsyntax/peeker.go
+++ b/hclsyntax/peeker.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/peeker_test.go b/hclsyntax/peeker_test.go
index cce3266d2..103f92a71 100644
--- a/hclsyntax/peeker_test.go
+++ b/hclsyntax/peeker_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/public.go b/hclsyntax/public.go
index 17dc1ed41..eb7681d89 100644
--- a/hclsyntax/public.go
+++ b/hclsyntax/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/public_test.go b/hclsyntax/public_test.go
index 6cdd3b170..8259d58d9 100644
--- a/hclsyntax/public_test.go
+++ b/hclsyntax/public_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/scan_string_lit.go b/hclsyntax/scan_string_lit.go
index 6b44d9923..cedfc073b 100644
--- a/hclsyntax/scan_string_lit.go
+++ b/hclsyntax/scan_string_lit.go
@@ -1,5 +1,5 @@
 //line scan_string_lit.rl:1
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/scan_string_lit_test.go b/hclsyntax/scan_string_lit_test.go
index bebad0ee0..791541b19 100644
--- a/hclsyntax/scan_string_lit_test.go
+++ b/hclsyntax/scan_string_lit_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/scan_tokens.go b/hclsyntax/scan_tokens.go
index 3ed8455ff..02d593a81 100644
--- a/hclsyntax/scan_tokens.go
+++ b/hclsyntax/scan_tokens.go
@@ -1,5 +1,5 @@
 //line scan_tokens.rl:1
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/scan_tokens_test.go b/hclsyntax/scan_tokens_test.go
index 10c420077..d86e2c3de 100644
--- a/hclsyntax/scan_tokens_test.go
+++ b/hclsyntax/scan_tokens_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/structure.go b/hclsyntax/structure.go
index 545ef42f5..36e4d6469 100644
--- a/hclsyntax/structure.go
+++ b/hclsyntax/structure.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/structure_at_pos.go b/hclsyntax/structure_at_pos.go
index 508571684..228d0e3fb 100644
--- a/hclsyntax/structure_at_pos.go
+++ b/hclsyntax/structure_at_pos.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/structure_at_pos_test.go b/hclsyntax/structure_at_pos_test.go
index 51b981d6e..74b589435 100644
--- a/hclsyntax/structure_at_pos_test.go
+++ b/hclsyntax/structure_at_pos_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/structure_test.go b/hclsyntax/structure_test.go
index 180425bf8..2c2a3c557 100644
--- a/hclsyntax/structure_test.go
+++ b/hclsyntax/structure_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/token.go b/hclsyntax/token.go
index 47648b8f0..db7afa0dd 100644
--- a/hclsyntax/token.go
+++ b/hclsyntax/token.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/token_test.go b/hclsyntax/token_test.go
index 2ce054791..0aaec25ba 100644
--- a/hclsyntax/token_test.go
+++ b/hclsyntax/token_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/unicode2ragel.rb b/hclsyntax/unicode2ragel.rb
index 235265de9..7a3253164 100644
--- a/hclsyntax/unicode2ragel.rb
+++ b/hclsyntax/unicode2ragel.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2014, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 #
diff --git a/hclsyntax/variables.go b/hclsyntax/variables.go
index af2c4601b..ff131cdb9 100644
--- a/hclsyntax/variables.go
+++ b/hclsyntax/variables.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/variables_test.go b/hclsyntax/variables_test.go
index 9eb3d4112..3f909421d 100644
--- a/hclsyntax/variables_test.go
+++ b/hclsyntax/variables_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/walk.go b/hclsyntax/walk.go
index 82b6f9b03..ec1c49797 100644
--- a/hclsyntax/walk.go
+++ b/hclsyntax/walk.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hclsyntax/walk_test.go b/hclsyntax/walk_test.go
index 540938e2a..1a4be452d 100644
--- a/hclsyntax/walk_test.go
+++ b/hclsyntax/walk_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax
diff --git a/hcltest/doc.go b/hcltest/doc.go
index d450a2b9e..958f843bc 100644
--- a/hcltest/doc.go
+++ b/hcltest/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hcltest contains utilities that aim to make it more convenient
diff --git a/hcltest/mock.go b/hcltest/mock.go
index 9df3e8d15..a0a44d5ac 100644
--- a/hcltest/mock.go
+++ b/hcltest/mock.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcltest
diff --git a/hcltest/mock_test.go b/hcltest/mock_test.go
index 648018a53..4a669a97f 100644
--- a/hcltest/mock_test.go
+++ b/hcltest/mock_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcltest
diff --git a/hclwrite/ast.go b/hclwrite/ast.go
index 6ebca404f..c1b3f3fa8 100644
--- a/hclwrite/ast.go
+++ b/hclwrite/ast.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_attribute.go b/hclwrite/ast_attribute.go
index b004b742a..342cfce44 100644
--- a/hclwrite/ast_attribute.go
+++ b/hclwrite/ast_attribute.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_block.go b/hclwrite/ast_block.go
index 0a4c693ed..97ae802d5 100644
--- a/hclwrite/ast_block.go
+++ b/hclwrite/ast_block.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_block_test.go b/hclwrite/ast_block_test.go
index ac1cd4ede..ce635f7e9 100644
--- a/hclwrite/ast_block_test.go
+++ b/hclwrite/ast_block_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_body.go b/hclwrite/ast_body.go
index 08e8714e1..4143d221c 100644
--- a/hclwrite/ast_body.go
+++ b/hclwrite/ast_body.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_body_test.go b/hclwrite/ast_body_test.go
index a84072509..6845b4783 100644
--- a/hclwrite/ast_body_test.go
+++ b/hclwrite/ast_body_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_expression.go b/hclwrite/ast_expression.go
index 77b9f780d..ffe78752b 100644
--- a/hclwrite/ast_expression.go
+++ b/hclwrite/ast_expression.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/ast_test.go b/hclwrite/ast_test.go
index 12bb05468..a36c646cb 100644
--- a/hclwrite/ast_test.go
+++ b/hclwrite/ast_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/doc.go b/hclwrite/doc.go
index 57ec37ea0..04b277eb1 100644
--- a/hclwrite/doc.go
+++ b/hclwrite/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package hclwrite deals with the problem of generating HCL configuration
diff --git a/hclwrite/examples_test.go b/hclwrite/examples_test.go
index f61d7827f..ad0631071 100644
--- a/hclwrite/examples_test.go
+++ b/hclwrite/examples_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite_test
diff --git a/hclwrite/format.go b/hclwrite/format.go
index 93688adc2..a9d802995 100644
--- a/hclwrite/format.go
+++ b/hclwrite/format.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/format_test.go b/hclwrite/format_test.go
index 5c4eb7a6d..350f4cebd 100644
--- a/hclwrite/format_test.go
+++ b/hclwrite/format_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/fuzz/fuzz_test.go b/hclwrite/fuzz/fuzz_test.go
index cec86beef..c52225343 100644
--- a/hclwrite/fuzz/fuzz_test.go
+++ b/hclwrite/fuzz/fuzz_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package fuzzhclwrite
diff --git a/hclwrite/generate.go b/hclwrite/generate.go
index 678d53913..d3359f7a2 100644
--- a/hclwrite/generate.go
+++ b/hclwrite/generate.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/generate_test.go b/hclwrite/generate_test.go
index 395919230..6d87b119e 100644
--- a/hclwrite/generate_test.go
+++ b/hclwrite/generate_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/native_node_sorter.go b/hclwrite/native_node_sorter.go
index 0a78683bd..7944e2b95 100644
--- a/hclwrite/native_node_sorter.go
+++ b/hclwrite/native_node_sorter.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/node.go b/hclwrite/node.go
index 7ad4bb91f..2bb0149ca 100644
--- a/hclwrite/node.go
+++ b/hclwrite/node.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/parser.go b/hclwrite/parser.go
index 4042b3a52..db7115cf6 100644
--- a/hclwrite/parser.go
+++ b/hclwrite/parser.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/parser_test.go b/hclwrite/parser_test.go
index 8ccae9933..3fce9a08a 100644
--- a/hclwrite/parser_test.go
+++ b/hclwrite/parser_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/public.go b/hclwrite/public.go
index b65e039ef..7c38ee175 100644
--- a/hclwrite/public.go
+++ b/hclwrite/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/round_trip_test.go b/hclwrite/round_trip_test.go
index 9dbb1526f..b0090c340 100644
--- a/hclwrite/round_trip_test.go
+++ b/hclwrite/round_trip_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/hclwrite/tokens.go b/hclwrite/tokens.go
index d7f092900..596b7383f 100644
--- a/hclwrite/tokens.go
+++ b/hclwrite/tokens.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hclwrite
diff --git a/integrationtest/convertfunc_test.go b/integrationtest/convertfunc_test.go
index 0dc2adde8..00430a91a 100644
--- a/integrationtest/convertfunc_test.go
+++ b/integrationtest/convertfunc_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package integrationtest
diff --git a/integrationtest/doc.go b/integrationtest/doc.go
index 1a8146feb..ea539c5f9 100644
--- a/integrationtest/doc.go
+++ b/integrationtest/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package integrationtest is an internal package that contains some
diff --git a/integrationtest/hcldec_into_expr_test.go b/integrationtest/hcldec_into_expr_test.go
index 9b00f3bd1..c3533801b 100644
--- a/integrationtest/hcldec_into_expr_test.go
+++ b/integrationtest/hcldec_into_expr_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package integrationtest
diff --git a/integrationtest/terraformlike_test.go b/integrationtest/terraformlike_test.go
index ae8662696..38215a37c 100644
--- a/integrationtest/terraformlike_test.go
+++ b/integrationtest/terraformlike_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package integrationtest
diff --git a/json/ast.go b/json/ast.go
index 3b385ccec..0de060bca 100644
--- a/json/ast.go
+++ b/json/ast.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/didyoumean.go b/json/didyoumean.go
index dc004c4bb..6d4f6496a 100644
--- a/json/didyoumean.go
+++ b/json/didyoumean.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/didyoumean_test.go b/json/didyoumean_test.go
index f189790ba..103587dbb 100644
--- a/json/didyoumean_test.go
+++ b/json/didyoumean_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/doc.go b/json/doc.go
index bdc8f0932..2cce4a26e 100644
--- a/json/doc.go
+++ b/json/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 // Package json is the JSON parser for HCL. It parses JSON files and returns
diff --git a/json/fuzz/fuzz_test.go b/json/fuzz/fuzz_test.go
index ccc211840..d36fdc4ed 100644
--- a/json/fuzz/fuzz_test.go
+++ b/json/fuzz/fuzz_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package fuzzjson
diff --git a/json/is.go b/json/is.go
index 1d1a0b188..a5c6b9b1f 100644
--- a/json/is.go
+++ b/json/is.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/navigation.go b/json/navigation.go
index 7aab1ec08..7a745c9ad 100644
--- a/json/navigation.go
+++ b/json/navigation.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/navigation_test.go b/json/navigation_test.go
index f22a9ff4a..573ea61af 100644
--- a/json/navigation_test.go
+++ b/json/navigation_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/parser.go b/json/parser.go
index e39d84da6..9d5dfd213 100644
--- a/json/parser.go
+++ b/json/parser.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/parser_test.go b/json/parser_test.go
index 8f77630d5..e1b0e7e59 100644
--- a/json/parser_test.go
+++ b/json/parser_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/peeker.go b/json/peeker.go
index 02efa5b24..57d231fa8 100644
--- a/json/peeker.go
+++ b/json/peeker.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/public.go b/json/public.go
index 01305090e..7229b4784 100644
--- a/json/public.go
+++ b/json/public.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/public_test.go b/json/public_test.go
index 5385dbd4e..e56f10c0b 100644
--- a/json/public_test.go
+++ b/json/public_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/scanner.go b/json/scanner.go
index a5e213055..436d146a9 100644
--- a/json/scanner.go
+++ b/json/scanner.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/scanner_test.go b/json/scanner_test.go
index d59c201ef..bb859354c 100644
--- a/json/scanner_test.go
+++ b/json/scanner_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/structure.go b/json/structure.go
index 3b7c425cd..d65dcbe68 100644
--- a/json/structure.go
+++ b/json/structure.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/json/structure_test.go b/json/structure_test.go
index 533a46f25..ed95aca3d 100644
--- a/json/structure_test.go
+++ b/json/structure_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package json
diff --git a/merged.go b/merged.go
index 49474ee74..88017ee47 100644
--- a/merged.go
+++ b/merged.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/merged_test.go b/merged_test.go
index 598f22870..6533298cd 100644
--- a/merged_test.go
+++ b/merged_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/ops.go b/ops.go
index 9420abdb1..f16e9ba14 100644
--- a/ops.go
+++ b/ops.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/ops_test.go b/ops_test.go
index b515cb52f..fdba39a08 100644
--- a/ops_test.go
+++ b/ops_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/pos.go b/pos.go
index 1bbbce87e..f8d7d28c0 100644
--- a/pos.go
+++ b/pos.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/pos_scanner.go b/pos_scanner.go
index 2232f374a..4f02c8708 100644
--- a/pos_scanner.go
+++ b/pos_scanner.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/pos_scanner_test.go b/pos_scanner_test.go
index bb6a89a52..5e93255e6 100644
--- a/pos_scanner_test.go
+++ b/pos_scanner_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/pos_test.go b/pos_test.go
index b90545b82..b9b4ad51e 100644
--- a/pos_test.go
+++ b/pos_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/schema.go b/schema.go
index d4e339cb2..6c294b255 100644
--- a/schema.go
+++ b/schema.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh
index c09fa2085..f62d6b027 100755
--- a/scripts/gofmtcheck.sh
+++ b/scripts/gofmtcheck.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
+# Copyright IBM Corp. 2014, 2025
 # SPDX-License-Identifier: MPL-2.0
 
 if [[ -n $(gofmt -l ./) ]]; then echo "Please run gofmt -w ./ to format code"; exit 1; fi;
diff --git a/specsuite/spec_test.go b/specsuite/spec_test.go
index 36360a64c..9a2239261 100644
--- a/specsuite/spec_test.go
+++ b/specsuite/spec_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package spectests
diff --git a/static_expr.go b/static_expr.go
index e14d7f890..869f692d9 100644
--- a/static_expr.go
+++ b/static_expr.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/structure.go b/structure.go
index 2bdf579d1..d3333d3e5 100644
--- a/structure.go
+++ b/structure.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/structure_at_pos.go b/structure_at_pos.go
index 62aba139f..036884016 100644
--- a/structure_at_pos.go
+++ b/structure_at_pos.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/tools.go b/tools.go
index e8c42ad1f..f88ae8852 100644
--- a/tools.go
+++ b/tools.go
@@ -1,8 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 //go:build tools
-// +build tools
 
 package hcl
 
diff --git a/traversal.go b/traversal.go
index 540dde7ec..31295ef44 100644
--- a/traversal.go
+++ b/traversal.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/traversal_for_expr.go b/traversal_for_expr.go
index d3cb4507e..6e37d472f 100644
--- a/traversal_for_expr.go
+++ b/traversal_for_expr.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl
diff --git a/traversal_for_expr_test.go b/traversal_for_expr_test.go
index 5bfcebf01..721c1ba29 100644
--- a/traversal_for_expr_test.go
+++ b/traversal_for_expr_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package hcl