diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightGenerator.java
index 62bfa83065..de9d86f8cc 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightGenerator.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 Real Logic Limited.
+ * Copyright 2013-2024 Real Logic Limited.
  *
  * 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/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightOutputManager.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightOutputManager.java
index 954803ca29..3b9e72b716 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightOutputManager.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightOutputManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 Real Logic Limited.
+ * Copyright 2013-2024 Real Logic Limited.
  *
  * 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/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightUtil.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightUtil.java
index 21509c1472..78ac285b6c 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightUtil.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 Real Logic Limited.
+ * Copyright 2013-2024 Real Logic Limited.
  *
  * 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/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/golang/GolangGeneratorTest.java b/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/golang/GolangStructGeneratorTest.java
similarity index 99%
rename from sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/golang/GolangGeneratorTest.java
rename to sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/golang/GolangStructGeneratorTest.java
index af647727f2..b4d6198680 100644
--- a/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/golang/GolangGeneratorTest.java
+++ b/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/golang/GolangStructGeneratorTest.java
@@ -18,6 +18,7 @@
 import org.agrona.generation.StringWriterOutputManager;
 import org.junit.jupiter.api.Test;
 import uk.co.real_logic.sbe.Tests;
+import uk.co.real_logic.sbe.generation.golang.struct.GolangGenerator;
 import uk.co.real_logic.sbe.ir.Ir;
 import uk.co.real_logic.sbe.xml.IrGenerator;
 import uk.co.real_logic.sbe.xml.MessageSchema;
@@ -28,7 +29,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.parse;
 
-class GolangGeneratorTest
+class GolangStructGeneratorTest
 {
     @Test
     @SuppressWarnings("MethodLength")