diff --git a/NOTICE b/NOTICE
index 808a43a9..3f1e6783 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
 Cadence-lint
-Copyright 2019-2022 Dapper Labs, Inc.
+Copyright Flow Foundation
 
-This product includes software developed at Dapper Labs, Inc. (https://www.dapperlabs.com/).
+This product includes software developed at at the Flow Foundation (https://flow.com/flow-foundation).
diff --git a/docgen/cmd/main.go b/docgen/cmd/main.go
index 578fbb95..8e416a5d 100644
--- a/docgen/cmd/main.go
+++ b/docgen/cmd/main.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence docgen - The Cadence documentation generator
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docgen/doc_generator.go b/docgen/doc_generator.go
index 29b031fe..80e09591 100644
--- a/docgen/doc_generator.go
+++ b/docgen/doc_generator.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence docgen - The Cadence documentation generator
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docgen/templates/markdown-templates.go b/docgen/templates/markdown-templates.go
index 201b4fdc..d8602a84 100644
--- a/docgen/templates/markdown-templates.go
+++ b/docgen/templates/markdown-templates.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence docgen - The Cadence documentation generator
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import (
 var mdTemplateFiles embed.FS
 
 // MarkdownTemplateProvider is a provider for the markdown template files.
-//
 type MarkdownTemplateProvider struct {
 }
 
diff --git a/docgen/templates/templates.go b/docgen/templates/templates.go
index 2f567666..90b4aed2 100644
--- a/docgen/templates/templates.go
+++ b/docgen/templates/templates.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence docgen - The Cadence documentation generator
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ package templates
 // TemplateProvider is a template provider interface that has to be
 // implemented by all the template providers of the document generator.
 // e.g: Markdown templates.
-//
 type TemplateProvider interface {
 	Get(templateName string) (string, error)
 }
diff --git a/docgen/test/doc_gen_test.go b/docgen/test/doc_gen_test.go
index 3f844e23..f1456a49 100644
--- a/docgen/test/doc_gen_test.go
+++ b/docgen/test/doc_gen_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence docgen - The Cadence documentation generator
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docgen/wasm/main.go b/docgen/wasm/main.go
index 6d2cff93..9c8cf2ae 100644
--- a/docgen/wasm/main.go
+++ b/docgen/wasm/main.go
@@ -2,7 +2,7 @@
 // +build wasm
 
 /*
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/Makefile b/languageserver/Makefile
index e26e30ea..30a64f84 100644
--- a/languageserver/Makefile
+++ b/languageserver/Makefile
@@ -1,7 +1,7 @@
 #
 # Cadence - The resource-oriented smart contract programming language
 #
-# Copyright 2019-2020 Dapper Labs, Inc.
+# Copyright Flow Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/languageserver/cmd/languageserver/main.go b/languageserver/cmd/languageserver/main.go
index 0004ee32..7a6e872c 100644
--- a/languageserver/cmd/languageserver/main.go
+++ b/languageserver/cmd/languageserver/main.go
@@ -2,9 +2,9 @@
 // +build !wasm
 
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,9 @@
 package main
 
 import (
-	"github.com/onflow/cadence-tools/languageserver"
 	"github.com/spf13/pflag"
+
+	"github.com/onflow/cadence-tools/languageserver"
 )
 
 var enableFlowClientFlag = pflag.Bool("enable-flow-client", true, "enable Flow client functionality")
diff --git a/languageserver/cmd/languageserver/main_wasm.go b/languageserver/cmd/languageserver/main_wasm.go
index 19b445b6..893e8da6 100644
--- a/languageserver/cmd/languageserver/main_wasm.go
+++ b/languageserver/cmd/languageserver/main_wasm.go
@@ -2,7 +2,7 @@
 // +build wasm
 
 /*
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/conversion/conversion.go b/languageserver/conversion/conversion.go
index c24b0e1b..84822f43 100644
--- a/languageserver/conversion/conversion.go
+++ b/languageserver/conversion/conversion.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/argument.go b/languageserver/integration/argument.go
index 66c8c564..3c758224 100644
--- a/languageserver/integration/argument.go
+++ b/languageserver/integration/argument.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/argument_test.go b/languageserver/integration/argument_test.go
index 4a74e930..f3e2393e 100644
--- a/languageserver/integration/argument_test.go
+++ b/languageserver/integration/argument_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/commands.go b/languageserver/integration/commands.go
index 8bf47f84..881570d8 100644
--- a/languageserver/integration/commands.go
+++ b/languageserver/integration/commands.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/commands_test.go b/languageserver/integration/commands_test.go
index 697cc914..6a8597c5 100644
--- a/languageserver/integration/commands_test.go
+++ b/languageserver/integration/commands_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/contracts.go b/languageserver/integration/contracts.go
index 37adbe76..210aa385 100644
--- a/languageserver/integration/contracts.go
+++ b/languageserver/integration/contracts.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/contracts_test.go b/languageserver/integration/contracts_test.go
index d0b0cae7..6271f0e1 100644
--- a/languageserver/integration/contracts_test.go
+++ b/languageserver/integration/contracts_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/diagnostics.go b/languageserver/integration/diagnostics.go
index 4a518b6c..50c15805 100644
--- a/languageserver/integration/diagnostics.go
+++ b/languageserver/integration/diagnostics.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/entrypoint.go b/languageserver/integration/entrypoint.go
index 50b02cc5..7043923d 100644
--- a/languageserver/integration/entrypoint.go
+++ b/languageserver/integration/entrypoint.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/entrypoint_test.go b/languageserver/integration/entrypoint_test.go
index 23a07395..52ee2b51 100644
--- a/languageserver/integration/entrypoint_test.go
+++ b/languageserver/integration/entrypoint_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/flow.go b/languageserver/integration/flow.go
index 614db0a9..5b0a4d16 100644
--- a/languageserver/integration/flow.go
+++ b/languageserver/integration/flow.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/integration.go b/languageserver/integration/integration.go
index 683c12dc..e3018ad6 100644
--- a/languageserver/integration/integration.go
+++ b/languageserver/integration/integration.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/resolvers.go b/languageserver/integration/resolvers.go
index 6735d31e..c645aa2c 100644
--- a/languageserver/integration/resolvers.go
+++ b/languageserver/integration/resolvers.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/resolvers_test.go b/languageserver/integration/resolvers_test.go
index 2195a4e7..02cece3e 100644
--- a/languageserver/integration/resolvers_test.go
+++ b/languageserver/integration/resolvers_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/integration/state.go b/languageserver/integration/state.go
index d0d6ae43..44d73d24 100644
--- a/languageserver/integration/state.go
+++ b/languageserver/integration/state.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/jsonrpc2/server.go b/languageserver/jsonrpc2/server.go
index 07ae5237..32681e85 100644
--- a/languageserver/jsonrpc2/server.go
+++ b/languageserver/jsonrpc2/server.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/languageserver.go b/languageserver/languageserver.go
index 21bc0df4..e2c1e59a 100644
--- a/languageserver/languageserver.go
+++ b/languageserver/languageserver.go
@@ -2,9 +2,9 @@
 // +build !wasm
 
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/protocol/documentchanges.go b/languageserver/protocol/documentchanges.go
index 8467dab6..905beeb8 100644
--- a/languageserver/protocol/documentchanges.go
+++ b/languageserver/protocol/documentchanges.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/protocol/json.go b/languageserver/protocol/json.go
index 509385f5..0804c5b7 100644
--- a/languageserver/protocol/json.go
+++ b/languageserver/protocol/json.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/protocol/methods.go b/languageserver/protocol/methods.go
index 89a6c0b5..81a00cab 100644
--- a/languageserver/protocol/methods.go
+++ b/languageserver/protocol/methods.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/protocol/server.go b/languageserver/protocol/server.go
index a7fc813e..aa8ec952 100644
--- a/languageserver/protocol/server.go
+++ b/languageserver/protocol/server.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/protocol/types.go b/languageserver/protocol/types.go
index 749e43e2..b95f4946 100644
--- a/languageserver/protocol/types.go
+++ b/languageserver/protocol/types.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/command.go b/languageserver/server/command.go
index 5f9a9513..980831c8 100644
--- a/languageserver/server/command.go
+++ b/languageserver/server/command.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/document_test.go b/languageserver/server/document_test.go
index 87c26c04..81272724 100644
--- a/languageserver/server/document_test.go
+++ b/languageserver/server/document_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/linting_test.go b/languageserver/server/linting_test.go
index a4456019..886a0757 100644
--- a/languageserver/server/linting_test.go
+++ b/languageserver/server/linting_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/location.go b/languageserver/server/location.go
index 3d382eb2..7a206a23 100644
--- a/languageserver/server/location.go
+++ b/languageserver/server/location.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/objectstream.go b/languageserver/server/objectstream.go
index 18442ac2..4d1b4845 100644
--- a/languageserver/server/objectstream.go
+++ b/languageserver/server/objectstream.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/parameter.go b/languageserver/server/parameter.go
index 7c031df1..4d72c6aa 100644
--- a/languageserver/server/parameter.go
+++ b/languageserver/server/parameter.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/server.go b/languageserver/server/server.go
index 927db431..a22df74a 100644
--- a/languageserver/server/server.go
+++ b/languageserver/server/server.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/stdlib.go b/languageserver/server/stdlib.go
index 41a30b2c..5139f069 100644
--- a/languageserver/server/stdlib.go
+++ b/languageserver/server/stdlib.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/server/stdrwc.go b/languageserver/server/stdrwc.go
index 605c3668..6a7ff6a9 100644
--- a/languageserver/server/stdrwc.go
+++ b/languageserver/server/stdrwc.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/languageserver/test/util.go b/languageserver/test/util.go
index 73186679..1c7714b3 100644
--- a/languageserver/test/util.go
+++ b/languageserver/test/util.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence languageserver - The Cadence language server
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/analyzer.go b/lint/analyzer.go
index f7075d59..c76888ac 100644
--- a/lint/analyzer.go
+++ b/lint/analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/analyzers_test.go b/lint/analyzers_test.go
index b51607b9..fc224008 100644
--- a/lint/analyzers_test.go
+++ b/lint/analyzers_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/cadence_v1_analyzer.go b/lint/cadence_v1_analyzer.go
index 7a12b2e7..52098858 100644
--- a/lint/cadence_v1_analyzer.go
+++ b/lint/cadence_v1_analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/cadence_v1_analyzer_test.go b/lint/cadence_v1_analyzer_test.go
index 18451b24..df313a5d 100644
--- a/lint/cadence_v1_analyzer_test.go
+++ b/lint/cadence_v1_analyzer_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/cmd/lint/flag.go b/lint/cmd/lint/flag.go
index 1ae6102d..17b3ff6d 100644
--- a/lint/cmd/lint/flag.go
+++ b/lint/cmd/lint/flag.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/cmd/lint/main.go b/lint/cmd/lint/main.go
index fe8bfe8f..21586701 100644
--- a/lint/cmd/lint/main.go
+++ b/lint/cmd/lint/main.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/deprecated_member_analyzer.go b/lint/deprecated_member_analyzer.go
index 1c63a6e6..2cf4b427 100644
--- a/lint/deprecated_member_analyzer.go
+++ b/lint/deprecated_member_analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/deprecated_member_analyzer_test.go b/lint/deprecated_member_analyzer_test.go
index 8b963430..0b631eb5 100644
--- a/lint/deprecated_member_analyzer_test.go
+++ b/lint/deprecated_member_analyzer_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/diagnostic.go b/lint/diagnostic.go
index ce815247..649503ae 100644
--- a/lint/diagnostic.go
+++ b/lint/diagnostic.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/error.go b/lint/error.go
index 23f77d95..c8bfd6a0 100644
--- a/lint/error.go
+++ b/lint/error.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/lint.go b/lint/lint.go
index 4091887b..783f40c4 100644
--- a/lint/lint.go
+++ b/lint/lint.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/number_function_argument_analyzer.go b/lint/number_function_argument_analyzer.go
index c25e15c0..3f84fc0e 100644
--- a/lint/number_function_argument_analyzer.go
+++ b/lint/number_function_argument_analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/number_function_argument_analyzer_test.go b/lint/number_function_argument_analyzer_test.go
index f8640cf7..e7edd63a 100644
--- a/lint/number_function_argument_analyzer_test.go
+++ b/lint/number_function_argument_analyzer_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/redundant_cast_analyzer.go b/lint/redundant_cast_analyzer.go
index 85d9adb4..3d55c0e2 100644
--- a/lint/redundant_cast_analyzer.go
+++ b/lint/redundant_cast_analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/redundant_cast_analyzer_test.go b/lint/redundant_cast_analyzer_test.go
index ae735729..29f0e6b9 100644
--- a/lint/redundant_cast_analyzer_test.go
+++ b/lint/redundant_cast_analyzer_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/unnecessary_force_analyzer.go b/lint/unnecessary_force_analyzer.go
index c8ee1620..50c3d742 100644
--- a/lint/unnecessary_force_analyzer.go
+++ b/lint/unnecessary_force_analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/unnecessary_force_analyzer_test.go b/lint/unnecessary_force_analyzer_test.go
index 68b4bf39..77499d3d 100644
--- a/lint/unnecessary_force_analyzer_test.go
+++ b/lint/unnecessary_force_analyzer_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/unused_result_analyzer.go b/lint/unused_result_analyzer.go
index 4324d08e..ee90ab16 100644
--- a/lint/unused_result_analyzer.go
+++ b/lint/unused_result_analyzer.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lint/unused_result_analyzer_test.go b/lint/unused_result_analyzer_test.go
index 307bcc7f..20df749e 100644
--- a/lint/unused_result_analyzer_test.go
+++ b/lint/unused_result_analyzer_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence-lint - The Cadence linter
+ * Cadence lint - The Cadence linter
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/npm-packages/cadence-docgen/src/index.ts b/npm-packages/cadence-docgen/src/index.ts
index 89b5f075..fd67c2b8 100644
--- a/npm-packages/cadence-docgen/src/index.ts
+++ b/npm-packages/cadence-docgen/src/index.ts
@@ -1,7 +1,7 @@
 /*
  * Cadence - The resource-oriented smart contract programming language
  *
- * Copyright 2019-2020 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/npm-packages/cadence-language-server-demo/src/cadence.ts b/npm-packages/cadence-language-server-demo/src/cadence.ts
index ac14afb9..55ca3558 100644
--- a/npm-packages/cadence-language-server-demo/src/cadence.ts
+++ b/npm-packages/cadence-language-server-demo/src/cadence.ts
@@ -1,7 +1,7 @@
 /*
  * Cadence - The resource-oriented smart contract programming language
  *
- * Copyright 2019-2020 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/npm-packages/cadence-language-server-demo/src/index.ts b/npm-packages/cadence-language-server-demo/src/index.ts
index 1be76960..4f277121 100644
--- a/npm-packages/cadence-language-server-demo/src/index.ts
+++ b/npm-packages/cadence-language-server-demo/src/index.ts
@@ -1,7 +1,7 @@
 /*
  * Cadence - The resource-oriented smart contract programming language
  *
- * Copyright 2019-2020 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/npm-packages/cadence-language-server/src/index.ts b/npm-packages/cadence-language-server/src/index.ts
index a2df0b1b..389d79e5 100644
--- a/npm-packages/cadence-language-server/src/index.ts
+++ b/npm-packages/cadence-language-server/src/index.ts
@@ -1,7 +1,7 @@
 /*
  * Cadence - The resource-oriented smart contract programming language
  *
- * Copyright 2019-2020 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/dummy_test.go b/test/dummy_test.go
index 415f977f..0609a61b 100644
--- a/test/dummy_test.go
+++ b/test/dummy_test.go
@@ -1,7 +1,7 @@
 /*
- * Flow Emulator
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2023 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@ import "github.com/btcsuite/btcd/chaincfg/chainhash"
 // this is added to resolve the issue with chainhash ambiguous import,
 // the code is not used, but it's needed to force go.mod specify and retain chainhash version
 // workaround for issue: https://github.com/golang/go/issues/27899
- var _ = chainhash.Hash{}
\ No newline at end of file
+var _ = chainhash.Hash{}
diff --git a/test/emulator_backend.go b/test/emulator_backend.go
index 1f2718d9..f7d210a7 100644
--- a/test/emulator_backend.go
+++ b/test/emulator_backend.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/errors.go b/test/errors.go
index 0c5b7cc4..2a94c9d4 100644
--- a/test/errors.go
+++ b/test/errors.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ package test
 
 // ImportResolverNotProvidedError is thrown if the import resolver is not
 // set in the TestRunner, when running tests.
-//
 type ImportResolverNotProvidedError struct {
 	Err error
 }
@@ -38,7 +37,6 @@ func (e ImportResolverNotProvidedError) Error() string {
 
 // FileResolverNotProvidedError is thrown if the file resolver is not
 // set in the TestRunner, when running tests.
-//
 type FileResolverNotProvidedError struct {
 	Err error
 }
diff --git a/test/helpers/blockchain_helpers.go b/test/helpers/blockchain_helpers.go
index 7a025d9e..52617f78 100644
--- a/test/helpers/blockchain_helpers.go
+++ b/test/helpers/blockchain_helpers.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/helpers/blockchain_helpers_test.go b/test/helpers/blockchain_helpers_test.go
index 2a582277..0bc347e8 100644
--- a/test/helpers/blockchain_helpers_test.go
+++ b/test/helpers/blockchain_helpers_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/scripts.go b/test/scripts.go
index d1b7d829..e1888fd4 100644
--- a/test/scripts.go
+++ b/test/scripts.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test_framework_provider.go b/test/test_framework_provider.go
index ee53824a..678caa5d 100644
--- a/test/test_framework_provider.go
+++ b/test/test_framework_provider.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test_framework_test.go b/test/test_framework_test.go
index d5d782d0..ce51ce04 100644
--- a/test/test_framework_test.go
+++ b/test/test_framework_test.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test_runner.go b/test/test_runner.go
index a1ceda35..2c21b2ac 100644
--- a/test/test_runner.go
+++ b/test/test_runner.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/transactions.go b/test/transactions.go
index 41bca731..01f9de27 100644
--- a/test/transactions.go
+++ b/test/transactions.go
@@ -1,7 +1,7 @@
 /*
- * Cadence - The resource-oriented smart contract programming language
+ * Cadence test - The Cadence test framework
  *
- * Copyright 2019-2022 Dapper Labs, Inc.
+ * Copyright Flow Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.