diff --git a/scalabuff-compiler/src/main/net/sandrogrzicic/scalabuff/compiler/Generator.scala b/scalabuff-compiler/src/main/net/sandrogrzicic/scalabuff/compiler/Generator.scala
index a6da533..83affbc 100644
--- a/scalabuff-compiler/src/main/net/sandrogrzicic/scalabuff/compiler/Generator.scala
+++ b/scalabuff-compiler/src/main/net/sandrogrzicic/scalabuff/compiler/Generator.scala
@@ -420,7 +420,7 @@ class Generator protected (sourceName: String, importedSymbols: Map[String, Impo
       if (ge210)
         out.append("@beans.BeanProperty val defaultInstance = new ")
       else
-        out.append("@reflect.BeanProperty val defaultInstance = new ")
+        out.append("@beans.BeanProperty val defaultInstance = new ")
 
       out.append(name).append("()\n").append("\n")
 
diff --git a/scalabuff-compiler/src/test/resources/generated/Complex.scala b/scalabuff-compiler/src/test/resources/generated/Complex.scala
index a13c593..9b88ddd 100644
--- a/scalabuff-compiler/src/test/resources/generated/Complex.scala
+++ b/scalabuff-compiler/src/test/resources/generated/Complex.scala
@@ -114,7 +114,7 @@ final case class ComplexMessage (
 }
 
 object ComplexMessage {
-	@reflect.BeanProperty val defaultInstance = new ComplexMessage()
+	@beans.BeanProperty val defaultInstance = new ComplexMessage()
 
 	def parseFrom(data: Array[Byte]): ComplexMessage = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): ComplexMessage = defaultInstance.mergeFrom(data, offset, length)
@@ -212,7 +212,7 @@ object ComplexMessage {
 	}
 
 	object Nested {
-		@reflect.BeanProperty val defaultInstance = new Nested()
+		@beans.BeanProperty val defaultInstance = new Nested()
 
 		def parseFrom(data: Array[Byte]): Nested = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): Nested = defaultInstance.mergeFrom(data, offset, length)
@@ -289,7 +289,7 @@ final case class AnotherMessage (
 }
 
 object AnotherMessage {
-	@reflect.BeanProperty val defaultInstance = new AnotherMessage()
+	@beans.BeanProperty val defaultInstance = new AnotherMessage()
 
 	def parseFrom(data: Array[Byte]): AnotherMessage = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): AnotherMessage = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/DataTypesTest.scala b/scalabuff-compiler/src/test/resources/generated/DataTypesTest.scala
index f9c14f8..de7311a 100644
--- a/scalabuff-compiler/src/test/resources/generated/DataTypesTest.scala
+++ b/scalabuff-compiler/src/test/resources/generated/DataTypesTest.scala
@@ -214,7 +214,7 @@ final case class DataTypes (
 }
 
 object DataTypes {
-	@reflect.BeanProperty val defaultInstance = new DataTypes()
+	@beans.BeanProperty val defaultInstance = new DataTypes()
 
 	def parseFrom(data: Array[Byte]): DataTypes = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): DataTypes = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/DhComplex.scala b/scalabuff-compiler/src/test/resources/generated/DhComplex.scala
index 68fb82e..c5bcce4 100644
--- a/scalabuff-compiler/src/test/resources/generated/DhComplex.scala
+++ b/scalabuff-compiler/src/test/resources/generated/DhComplex.scala
@@ -62,7 +62,7 @@ final case class Response (
 }
 
 object Response {
-	@reflect.BeanProperty val defaultInstance = new Response()
+	@beans.BeanProperty val defaultInstance = new Response()
 
 	def parseFrom(data: Array[Byte]): Response = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): Response = defaultInstance.mergeFrom(data, offset, length)
@@ -152,7 +152,7 @@ object Response {
 	}
 
 	object Rendition {
-		@reflect.BeanProperty val defaultInstance = new Rendition()
+		@beans.BeanProperty val defaultInstance = new Rendition()
 
 		def parseFrom(data: Array[Byte]): Rendition = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): Rendition = defaultInstance.mergeFrom(data, offset, length)
@@ -228,7 +228,7 @@ object Response {
 		}
 
 		object Property {
-			@reflect.BeanProperty val defaultInstance = new Property()
+			@beans.BeanProperty val defaultInstance = new Property()
 
 			def parseFrom(data: Array[Byte]): Property = defaultInstance.mergeFrom(data)
 			def parseFrom(data: Array[Byte], offset: Int, length: Int): Property = defaultInstance.mergeFrom(data, offset, length)
@@ -356,7 +356,7 @@ object Response {
 	}
 
 	object Video {
-		@reflect.BeanProperty val defaultInstance = new Video()
+		@beans.BeanProperty val defaultInstance = new Video()
 
 		def parseFrom(data: Array[Byte]): Video = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): Video = defaultInstance.mergeFrom(data, offset, length)
@@ -450,7 +450,7 @@ object Response {
 	}
 
 	object VideoFailure {
-		@reflect.BeanProperty val defaultInstance = new VideoFailure()
+		@beans.BeanProperty val defaultInstance = new VideoFailure()
 
 		def parseFrom(data: Array[Byte]): VideoFailure = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): VideoFailure = defaultInstance.mergeFrom(data, offset, length)
@@ -566,7 +566,7 @@ object Response {
 	}
 
 	object VideoResult {
-		@reflect.BeanProperty val defaultInstance = new VideoResult()
+		@beans.BeanProperty val defaultInstance = new VideoResult()
 
 		def parseFrom(data: Array[Byte]): VideoResult = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): VideoResult = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/EnumTest.scala b/scalabuff-compiler/src/test/resources/generated/EnumTest.scala
index fd3ce12..58bda2c 100644
--- a/scalabuff-compiler/src/test/resources/generated/EnumTest.scala
+++ b/scalabuff-compiler/src/test/resources/generated/EnumTest.scala
@@ -97,7 +97,7 @@ final case class Outer (
 }
 
 object Outer {
-	@reflect.BeanProperty val defaultInstance = new Outer()
+	@beans.BeanProperty val defaultInstance = new Outer()
 
 	def parseFrom(data: Array[Byte]): Outer = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): Outer = defaultInstance.mergeFrom(data, offset, length)
@@ -208,7 +208,7 @@ final case class OuterDuplicate (
 }
 
 object OuterDuplicate {
-	@reflect.BeanProperty val defaultInstance = new OuterDuplicate()
+	@beans.BeanProperty val defaultInstance = new OuterDuplicate()
 
 	def parseFrom(data: Array[Byte]): OuterDuplicate = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): OuterDuplicate = defaultInstance.mergeFrom(data, offset, length)
@@ -298,7 +298,7 @@ final case class OuterEnumContainer (
 }
 
 object OuterEnumContainer {
-	@reflect.BeanProperty val defaultInstance = new OuterEnumContainer()
+	@beans.BeanProperty val defaultInstance = new OuterEnumContainer()
 
 	def parseFrom(data: Array[Byte]): OuterEnumContainer = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): OuterEnumContainer = defaultInstance.mergeFrom(data, offset, length)
@@ -365,7 +365,7 @@ object OuterEnumContainer {
 	}
 
 	object InnerEnumContainer {
-		@reflect.BeanProperty val defaultInstance = new InnerEnumContainer()
+		@beans.BeanProperty val defaultInstance = new InnerEnumContainer()
 
 		def parseFrom(data: Array[Byte]): InnerEnumContainer = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): InnerEnumContainer = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/Extensions.scala b/scalabuff-compiler/src/test/resources/generated/Extensions.scala
index bd2e9a4..e4073a7 100644
--- a/scalabuff-compiler/src/test/resources/generated/Extensions.scala
+++ b/scalabuff-compiler/src/test/resources/generated/Extensions.scala
@@ -56,7 +56,7 @@ final case class ExtensionsTest (
 }
 
 object ExtensionsTest {
-	@reflect.BeanProperty val defaultInstance = new ExtensionsTest()
+	@beans.BeanProperty val defaultInstance = new ExtensionsTest()
 
 	def parseFrom(data: Array[Byte]): ExtensionsTest = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): ExtensionsTest = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/GroupsTest.scala b/scalabuff-compiler/src/test/resources/generated/GroupsTest.scala
index 012410b..9f2ec8d 100644
--- a/scalabuff-compiler/src/test/resources/generated/GroupsTest.scala
+++ b/scalabuff-compiler/src/test/resources/generated/GroupsTest.scala
@@ -53,7 +53,7 @@ final case class Groups (
 }
 
 object Groups {
-	@reflect.BeanProperty val defaultInstance = new Groups()
+	@beans.BeanProperty val defaultInstance = new Groups()
 
 	def parseFrom(data: Array[Byte]): Groups = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): Groups = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/ImportPackages.scala b/scalabuff-compiler/src/test/resources/generated/ImportPackages.scala
index f3fd044..e17c25e 100644
--- a/scalabuff-compiler/src/test/resources/generated/ImportPackages.scala
+++ b/scalabuff-compiler/src/test/resources/generated/ImportPackages.scala
@@ -60,7 +60,7 @@ final case class UsesImportPackage (
 }
 
 object UsesImportPackage {
-	@reflect.BeanProperty val defaultInstance = new UsesImportPackage()
+	@beans.BeanProperty val defaultInstance = new UsesImportPackage()
 
 	def parseFrom(data: Array[Byte]): UsesImportPackage = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): UsesImportPackage = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/Imports.scala b/scalabuff-compiler/src/test/resources/generated/Imports.scala
index acff03d..9bb9e48 100644
--- a/scalabuff-compiler/src/test/resources/generated/Imports.scala
+++ b/scalabuff-compiler/src/test/resources/generated/Imports.scala
@@ -59,7 +59,7 @@ final case class UsesImport (
 }
 
 object UsesImport {
-	@reflect.BeanProperty val defaultInstance = new UsesImport()
+	@beans.BeanProperty val defaultInstance = new UsesImport()
 
 	def parseFrom(data: Array[Byte]): UsesImport = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): UsesImport = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/Keywords.scala b/scalabuff-compiler/src/test/resources/generated/Keywords.scala
index c1fe4ce..3243608 100644
--- a/scalabuff-compiler/src/test/resources/generated/Keywords.scala
+++ b/scalabuff-compiler/src/test/resources/generated/Keywords.scala
@@ -113,7 +113,7 @@ final case class KeywordsTest (
 }
 
 object KeywordsTest {
-	@reflect.BeanProperty val defaultInstance = new KeywordsTest()
+	@beans.BeanProperty val defaultInstance = new KeywordsTest()
 
 	def parseFrom(data: Array[Byte]): KeywordsTest = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): KeywordsTest = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/MultiOne.scala b/scalabuff-compiler/src/test/resources/generated/MultiOne.scala
index 5b4ed95..36f08f7 100644
--- a/scalabuff-compiler/src/test/resources/generated/MultiOne.scala
+++ b/scalabuff-compiler/src/test/resources/generated/MultiOne.scala
@@ -54,7 +54,7 @@ final case class MutiMessageOne (
 }
 
 object MutiMessageOne {
-	@reflect.BeanProperty val defaultInstance = new MutiMessageOne()
+	@beans.BeanProperty val defaultInstance = new MutiMessageOne()
 
 	def parseFrom(data: Array[Byte]): MutiMessageOne = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): MutiMessageOne = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/MultiTwo.scala b/scalabuff-compiler/src/test/resources/generated/MultiTwo.scala
index feb1a79..c62759b 100644
--- a/scalabuff-compiler/src/test/resources/generated/MultiTwo.scala
+++ b/scalabuff-compiler/src/test/resources/generated/MultiTwo.scala
@@ -106,7 +106,7 @@ final case class MultiMessageTwo (
 }
 
 object MultiMessageTwo {
-	@reflect.BeanProperty val defaultInstance = new MultiMessageTwo()
+	@beans.BeanProperty val defaultInstance = new MultiMessageTwo()
 
 	def parseFrom(data: Array[Byte]): MultiMessageTwo = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): MultiMessageTwo = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/NestedMessages.scala b/scalabuff-compiler/src/test/resources/generated/NestedMessages.scala
index 24d876f..02456d2 100644
--- a/scalabuff-compiler/src/test/resources/generated/NestedMessages.scala
+++ b/scalabuff-compiler/src/test/resources/generated/NestedMessages.scala
@@ -57,7 +57,7 @@ final case class TopLevel (
 }
 
 object TopLevel {
-	@reflect.BeanProperty val defaultInstance = new TopLevel()
+	@beans.BeanProperty val defaultInstance = new TopLevel()
 
 	def parseFrom(data: Array[Byte]): TopLevel = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): TopLevel = defaultInstance.mergeFrom(data, offset, length)
@@ -124,7 +124,7 @@ object TopLevel {
 	}
 
 	object Inner {
-		@reflect.BeanProperty val defaultInstance = new Inner()
+		@beans.BeanProperty val defaultInstance = new Inner()
 
 		def parseFrom(data: Array[Byte]): Inner = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): Inner = defaultInstance.mergeFrom(data, offset, length)
@@ -279,7 +279,7 @@ final case class Foobar (
 }
 
 object Foobar {
-	@reflect.BeanProperty val defaultInstance = new Foobar()
+	@beans.BeanProperty val defaultInstance = new Foobar()
 
 	def parseFrom(data: Array[Byte]): Foobar = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): Foobar = defaultInstance.mergeFrom(data, offset, length)
@@ -356,7 +356,7 @@ object Foobar {
 	}
 
 	object Foo {
-		@reflect.BeanProperty val defaultInstance = new Foo()
+		@beans.BeanProperty val defaultInstance = new Foo()
 
 		def parseFrom(data: Array[Byte]): Foo = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): Foo = defaultInstance.mergeFrom(data, offset, length)
@@ -426,7 +426,7 @@ object Foobar {
 	}
 
 	object Bar {
-		@reflect.BeanProperty val defaultInstance = new Bar()
+		@beans.BeanProperty val defaultInstance = new Bar()
 
 		def parseFrom(data: Array[Byte]): Bar = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): Bar = defaultInstance.mergeFrom(data, offset, length)
@@ -496,7 +496,7 @@ object Foobar {
 	}
 
 	object FooBar {
-		@reflect.BeanProperty val defaultInstance = new FooBar()
+		@beans.BeanProperty val defaultInstance = new FooBar()
 
 		def parseFrom(data: Array[Byte]): FooBar = defaultInstance.mergeFrom(data)
 		def parseFrom(data: Array[Byte], offset: Int, length: Int): FooBar = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/Numbers.scala b/scalabuff-compiler/src/test/resources/generated/Numbers.scala
index 952c342..7fd48fd 100644
--- a/scalabuff-compiler/src/test/resources/generated/Numbers.scala
+++ b/scalabuff-compiler/src/test/resources/generated/Numbers.scala
@@ -68,7 +68,7 @@ final case class NumbersTest1 (
 }
 
 object NumbersTest1 {
-	@reflect.BeanProperty val defaultInstance = new NumbersTest1()
+	@beans.BeanProperty val defaultInstance = new NumbersTest1()
 
 	def parseFrom(data: Array[Byte]): NumbersTest1 = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): NumbersTest1 = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/RemoteProtocol.scala b/scalabuff-compiler/src/test/resources/generated/RemoteProtocol.scala
index fcc36d2..f98228c 100644
--- a/scalabuff-compiler/src/test/resources/generated/RemoteProtocol.scala
+++ b/scalabuff-compiler/src/test/resources/generated/RemoteProtocol.scala
@@ -74,7 +74,7 @@ final case class AkkaRemoteProtocol (
 }
 
 object AkkaRemoteProtocol {
-	@reflect.BeanProperty val defaultInstance = new AkkaRemoteProtocol()
+	@beans.BeanProperty val defaultInstance = new AkkaRemoteProtocol()
 
 	def parseFrom(data: Array[Byte]): AkkaRemoteProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): AkkaRemoteProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -174,7 +174,7 @@ final case class RemoteMessageProtocol (
 }
 
 object RemoteMessageProtocol {
-	@reflect.BeanProperty val defaultInstance = new RemoteMessageProtocol()
+	@beans.BeanProperty val defaultInstance = new RemoteMessageProtocol()
 
 	def parseFrom(data: Array[Byte]): RemoteMessageProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): RemoteMessageProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -266,7 +266,7 @@ final case class RemoteControlProtocol (
 }
 
 object RemoteControlProtocol {
-	@reflect.BeanProperty val defaultInstance = new RemoteControlProtocol()
+	@beans.BeanProperty val defaultInstance = new RemoteControlProtocol()
 
 	def parseFrom(data: Array[Byte]): RemoteControlProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): RemoteControlProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -358,7 +358,7 @@ final case class ActorRefProtocol (
 }
 
 object ActorRefProtocol {
-	@reflect.BeanProperty val defaultInstance = new ActorRefProtocol()
+	@beans.BeanProperty val defaultInstance = new ActorRefProtocol()
 
 	def parseFrom(data: Array[Byte]): ActorRefProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): ActorRefProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -442,7 +442,7 @@ final case class MessageProtocol (
 }
 
 object MessageProtocol {
-	@reflect.BeanProperty val defaultInstance = new MessageProtocol()
+	@beans.BeanProperty val defaultInstance = new MessageProtocol()
 
 	def parseFrom(data: Array[Byte]): MessageProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): MessageProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -519,7 +519,7 @@ final case class MetadataEntryProtocol (
 }
 
 object MetadataEntryProtocol {
-	@reflect.BeanProperty val defaultInstance = new MetadataEntryProtocol()
+	@beans.BeanProperty val defaultInstance = new MetadataEntryProtocol()
 
 	def parseFrom(data: Array[Byte]): MetadataEntryProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): MetadataEntryProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -602,7 +602,7 @@ final case class AddressProtocol (
 }
 
 object AddressProtocol {
-	@reflect.BeanProperty val defaultInstance = new AddressProtocol()
+	@beans.BeanProperty val defaultInstance = new AddressProtocol()
 
 	def parseFrom(data: Array[Byte]): AddressProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): AddressProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -693,7 +693,7 @@ final case class DaemonMsgCreateProtocol (
 }
 
 object DaemonMsgCreateProtocol {
-	@reflect.BeanProperty val defaultInstance = new DaemonMsgCreateProtocol()
+	@beans.BeanProperty val defaultInstance = new DaemonMsgCreateProtocol()
 
 	def parseFrom(data: Array[Byte]): DaemonMsgCreateProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): DaemonMsgCreateProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -798,7 +798,7 @@ final case class PropsProtocol (
 }
 
 object PropsProtocol {
-	@reflect.BeanProperty val defaultInstance = new PropsProtocol()
+	@beans.BeanProperty val defaultInstance = new PropsProtocol()
 
 	def parseFrom(data: Array[Byte]): PropsProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): PropsProtocol = defaultInstance.mergeFrom(data, offset, length)
@@ -897,7 +897,7 @@ final case class DeployProtocol (
 }
 
 object DeployProtocol {
-	@reflect.BeanProperty val defaultInstance = new DeployProtocol()
+	@beans.BeanProperty val defaultInstance = new DeployProtocol()
 
 	def parseFrom(data: Array[Byte]): DeployProtocol = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): DeployProtocol = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/ScalaBuffMessageTest.scala b/scalabuff-compiler/src/test/resources/generated/ScalaBuffMessageTest.scala
index 44092ce..ad52d9b 100644
--- a/scalabuff-compiler/src/test/resources/generated/ScalaBuffMessageTest.scala
+++ b/scalabuff-compiler/src/test/resources/generated/ScalaBuffMessageTest.scala
@@ -53,7 +53,7 @@ final case class EmptyMessage (
 }
 
 object EmptyMessage {
-	@reflect.BeanProperty val defaultInstance = new EmptyMessage()
+	@beans.BeanProperty val defaultInstance = new EmptyMessage()
 
 	def parseFrom(data: Array[Byte]): EmptyMessage = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): EmptyMessage = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/Simple.scala b/scalabuff-compiler/src/test/resources/generated/Simple.scala
index e6e561b..0cad020 100644
--- a/scalabuff-compiler/src/test/resources/generated/Simple.scala
+++ b/scalabuff-compiler/src/test/resources/generated/Simple.scala
@@ -133,7 +133,7 @@ final case class SimpleTest (
 }
 
 object SimpleTest {
-	@reflect.BeanProperty val defaultInstance = new SimpleTest()
+	@beans.BeanProperty val defaultInstance = new SimpleTest()
 
 	def parseFrom(data: Array[Byte]): SimpleTest = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): SimpleTest = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/SimpleWithComments.scala b/scalabuff-compiler/src/test/resources/generated/SimpleWithComments.scala
index 002d684..d3ccbc8 100644
--- a/scalabuff-compiler/src/test/resources/generated/SimpleWithComments.scala
+++ b/scalabuff-compiler/src/test/resources/generated/SimpleWithComments.scala
@@ -75,7 +75,7 @@ final case class SimpleRequest (
 }
 
 object SimpleRequest {
-	@reflect.BeanProperty val defaultInstance = new SimpleRequest()
+	@beans.BeanProperty val defaultInstance = new SimpleRequest()
 
 	def parseFrom(data: Array[Byte]): SimpleRequest = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): SimpleRequest = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/generated/nested/PackageName.scala b/scalabuff-compiler/src/test/resources/generated/nested/PackageName.scala
index 11cc10b..0a1532e 100644
--- a/scalabuff-compiler/src/test/resources/generated/nested/PackageName.scala
+++ b/scalabuff-compiler/src/test/resources/generated/nested/PackageName.scala
@@ -58,7 +58,7 @@ final case class PackageTest (
 }
 
 object PackageTest {
-	@reflect.BeanProperty val defaultInstance = new PackageTest()
+	@beans.BeanProperty val defaultInstance = new PackageTest()
 
 	def parseFrom(data: Array[Byte]): PackageTest = defaultInstance.mergeFrom(data)
 	def parseFrom(data: Array[Byte], offset: Int, length: Int): PackageTest = defaultInstance.mergeFrom(data, offset, length)
diff --git a/scalabuff-compiler/src/test/resources/parsed/invalidComplex.txt b/scalabuff-compiler/src/test/resources/parsed/invalidComplex.txt
index 66c0662..1fdb8b2 100644
--- a/scalabuff-compiler/src/test/resources/parsed/invalidComplex.txt
+++ b/scalabuff-compiler/src/test/resources/parsed/invalidComplex.txt
@@ -1,4 +1,4 @@
 <unknown>:5:11: `=' expected but `6' found
 	optional 6int640 invalid_field_user_type = 2; // invalid field user type
 
-	         ^
\ No newline at end of file
+	         ^
diff --git a/scalabuff-compiler/src/test/resources/parsed/invalidMessage.txt b/scalabuff-compiler/src/test/resources/parsed/invalidMessage.txt
index 76fd802..6b5577d 100644
--- a/scalabuff-compiler/src/test/resources/parsed/invalidMessage.txt
+++ b/scalabuff-compiler/src/test/resources/parsed/invalidMessage.txt
@@ -1,3 +1,3 @@
 <unknown>:3:17: `{' expected but `M' found
 message Invalid Message { }
-                ^
\ No newline at end of file
+                ^
diff --git a/scalabuff-compiler/src/test/resources/parsed/invalidSimple.txt b/scalabuff-compiler/src/test/resources/parsed/invalidSimple.txt
index a41c769..dc7dc79 100644
--- a/scalabuff-compiler/src/test/resources/parsed/invalidSimple.txt
+++ b/scalabuff-compiler/src/test/resources/parsed/invalidSimple.txt
@@ -1,3 +1,3 @@
 <unknown>:3:1: string matching regex `\z' expected but `i' found
 invalidSimple { }
-^
\ No newline at end of file
+^
diff --git a/scalabuff-compiler/src/test/resources/proto/dataTypes.proto b/scalabuff-compiler/src/test/resources/proto/dataTypes.proto
index cbedbe0..750bd5c 100644
--- a/scalabuff-compiler/src/test/resources/proto/dataTypes.proto
+++ b/scalabuff-compiler/src/test/resources/proto/dataTypes.proto
@@ -28,4 +28,4 @@ message DataTypes {
 	optional fixed32 f32bit1 = 500;
 	optional sfixed32 f32bit2 = 501;
 	optional float f32bit3 = 502;
-}
\ No newline at end of file
+}
diff --git a/scalabuff-compiler/src/test/resources/proto/empty.proto b/scalabuff-compiler/src/test/resources/proto/empty.proto
index 8a60dd1..134e06b 100644
--- a/scalabuff-compiler/src/test/resources/proto/empty.proto
+++ b/scalabuff-compiler/src/test/resources/proto/empty.proto
@@ -5,4 +5,4 @@ option java_outer_classname = "EmptyMessageTest";
 option optimize_for = LITE_RUNTIME;
 
 // empty .proto file;
-// contains only comments
\ No newline at end of file
+// contains only comments
diff --git a/scalabuff-compiler/src/test/resources/proto/groups.proto b/scalabuff-compiler/src/test/resources/proto/groups.proto
index 6a1f339..8fbdecb 100644
--- a/scalabuff-compiler/src/test/resources/proto/groups.proto
+++ b/scalabuff-compiler/src/test/resources/proto/groups.proto
@@ -6,4 +6,4 @@ message Groups {
   repeated group Group = 1 {
     required string name = 2;
 	}
-}
\ No newline at end of file
+}
diff --git a/scalabuff-compiler/src/test/resources/proto/imports.proto b/scalabuff-compiler/src/test/resources/proto/imports.proto
index c101354..ad85dbc 100644
--- a/scalabuff-compiler/src/test/resources/proto/imports.proto
+++ b/scalabuff-compiler/src/test/resources/proto/imports.proto
@@ -6,4 +6,4 @@ option optimize_for = LITE_RUNTIME;
 
 message UsesImport {
 	required SimpleTest simple_test = 1;
-}
\ No newline at end of file
+}
diff --git a/scalabuff-compiler/src/test/resources/proto/invalidComplex.proto b/scalabuff-compiler/src/test/resources/proto/invalidComplex.proto
index 429b767..a9e391e 100644
--- a/scalabuff-compiler/src/test/resources/proto/invalidComplex.proto
+++ b/scalabuff-compiler/src/test/resources/proto/invalidComplex.proto
@@ -10,4 +10,4 @@ message InvalidComplex { // correct
 	repeated packed invalid_option - 203 [packed-true]; // - instead of =
 	optional float floating floated = 502; // "floated" extra
 
-}
\ No newline at end of file
+}
diff --git a/scalabuff-compiler/src/test/resources/proto/invalidMessage.proto b/scalabuff-compiler/src/test/resources/proto/invalidMessage.proto
index 6a4bdb5..4c46e24 100644
--- a/scalabuff-compiler/src/test/resources/proto/invalidMessage.proto
+++ b/scalabuff-compiler/src/test/resources/proto/invalidMessage.proto
@@ -1,3 +1,3 @@
 package resources.generated;
 
-message Invalid Message { }
\ No newline at end of file
+message Invalid Message { }
diff --git a/scalabuff-compiler/src/test/resources/proto/invalidSimple.proto b/scalabuff-compiler/src/test/resources/proto/invalidSimple.proto
index d178b8b..fe74033 100644
--- a/scalabuff-compiler/src/test/resources/proto/invalidSimple.proto
+++ b/scalabuff-compiler/src/test/resources/proto/invalidSimple.proto
@@ -1,3 +1,3 @@
 package resources.generated;
 
-invalidSimple { }
\ No newline at end of file
+invalidSimple { }
diff --git a/scalabuff-compiler/src/test/resources/proto/message.proto b/scalabuff-compiler/src/test/resources/proto/message.proto
index 2de0c90..60f9bd6 100644
--- a/scalabuff-compiler/src/test/resources/proto/message.proto
+++ b/scalabuff-compiler/src/test/resources/proto/message.proto
@@ -5,4 +5,4 @@ option java_outer_classname = "ScalaBuffMessageTest";
 option optimize_for = LITE_RUNTIME;
 
 message EmptyMessage {
-}
\ No newline at end of file
+}
diff --git a/scalabuff-compiler/src/test/resources/proto/simpleWithComments.proto b/scalabuff-compiler/src/test/resources/proto/simpleWithComments.proto
index 8128777..05865cc 100644
--- a/scalabuff-compiler/src/test/resources/proto/simpleWithComments.proto
+++ b/scalabuff-compiler/src/test/resources/proto/simpleWithComments.proto
@@ -12,4 +12,4 @@ message SimpleRequest {                 // start message
 	optional int32 results_per_page = 3;  // number of results per page
 } // end simple request.
 
-// random comment
\ No newline at end of file
+// random comment
diff --git a/scalabuff-runtime/src/main/net/sandrogrzicic/scalabuff/Parser.scala b/scalabuff-runtime/src/main/net/sandrogrzicic/scalabuff/Parser.scala
index bb7b59a..8996017 100644
--- a/scalabuff-runtime/src/main/net/sandrogrzicic/scalabuff/Parser.scala
+++ b/scalabuff-runtime/src/main/net/sandrogrzicic/scalabuff/Parser.scala
@@ -159,4 +159,4 @@ trait Parser[MessageType <: MessageLite] extends com.google.protobuf.Parser[Mess
 
 object Parser {
   final val EMPTY_REGISTRY = ExtensionRegistryLite.getEmptyRegistry
-}
\ No newline at end of file
+}