feat(plc4go/tools): rename tools and improve documentation
diff --git a/plc4go/README.md b/plc4go/README.md
index 33dae48..a5bb86f 100644
--- a/plc4go/README.md
+++ b/plc4go/README.md
@@ -34,11 +34,25 @@
 `plc4xpcapanalyzer` is a small tool to evaluate the plc4x parsing against a pcap and report the success rate.
 
 To install `plc4xpcapanalyzer` run: 
-`go install github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer@latest`
+`go install github.com/apache/plc4x-extras/plc4go/tools/plc4xpcapanalyzer@latest`
 
 ### plc4xbrowser
 
 `plc4xbrowser` is a terminal application to run `REPL`-commands against a PLC using plc4x (plc4go)
 
 To install `plc4xbrowser` run: 
-`go install github.com/apache/plc4x/plc4go/tools/plc4xbrowser@latest`
+`go install github.com/apache/plc4x-extras/plc4go/tools/plc4xbrowser@latest`
+
+### plc4xLicenser
+
+`plc4xLicenser` is a generator to add the Apache licence to files
+
+To install `plc4xLicenser` run: 
+`go install github.com/apache/plc4x-extras/plc4go/tools/plc4xLicenser@latest`
+
+### plc4xGenerator
+
+`plc4xGenerator` is a generator to generate Serializable and String methods
+
+To install `plc4xGenerator` run: 
+`go install github.com/apache/plc4x-extras/plc4go/tools/plc4xGenerator@latest`
diff --git a/plc4go/internal/ads/MessageCodec.go b/plc4go/internal/ads/MessageCodec.go
index fed91a8..ed5c238 100644
--- a/plc4go/internal/ads/MessageCodec.go
+++ b/plc4go/internal/ads/MessageCodec.go
@@ -34,7 +34,7 @@
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 	none bool // TODO: just a empty field to satisfy generator (needs fixing because in this case here we have the delegate)
diff --git a/plc4go/internal/ads/MessageCodec_plc4xgen.go b/plc4go/internal/ads/MessageCodec_plc4xgen.go
index 748632d..2e64b80 100644
--- a/plc4go/internal/ads/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/ads/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package ads
 
diff --git a/plc4go/internal/ads/model/AdsSubscriptionHandle.go b/plc4go/internal/ads/model/AdsSubscriptionHandle.go
index bbbb5fc..e507086 100644
--- a/plc4go/internal/ads/model/AdsSubscriptionHandle.go
+++ b/plc4go/internal/ads/model/AdsSubscriptionHandle.go
@@ -31,7 +31,7 @@
 	"github.com/apache/plc4x/plc4go/spi/options"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=AdsSubscriptionHandle
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=AdsSubscriptionHandle
 type AdsSubscriptionHandle struct {
 	subscriber spi.PlcSubscriber
 	tagName    string
diff --git a/plc4go/internal/ads/model/AdsSubscriptionHandle_plc4xgen.go b/plc4go/internal/ads/model/AdsSubscriptionHandle_plc4xgen.go
index c505946..40cb70b 100644
--- a/plc4go/internal/ads/model/AdsSubscriptionHandle_plc4xgen.go
+++ b/plc4go/internal/ads/model/AdsSubscriptionHandle_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=AdsSubscriptionHandle"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=AdsSubscriptionHandle"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
index 7ddf868..c8568bf 100644
--- a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
+++ b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
@@ -37,7 +37,7 @@
 
 // ApplicationLayerMessageCodec is a wrapper for MessageCodec which takes care of segmentation, retries etc.
 //
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=ApplicationLayerMessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=ApplicationLayerMessageCodec
 type ApplicationLayerMessageCodec struct {
 	bipSimpleApplication *bacgopes.BIPSimpleApplication
 	messageCode          *MessageCodec
diff --git a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go
index 0d47b08..22b6fca 100644
--- a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go
+++ b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=ApplicationLayerMessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=ApplicationLayerMessageCodec"; DO NOT EDIT.
 
 package bacnetip
 
diff --git a/plc4go/internal/bacnetip/MessageCodec.go b/plc4go/internal/bacnetip/MessageCodec.go
index 1c5955b..cdd1fd0 100644
--- a/plc4go/internal/bacnetip/MessageCodec.go
+++ b/plc4go/internal/bacnetip/MessageCodec.go
@@ -32,7 +32,7 @@
 	"github.com/apache/plc4x/plc4go/spi/transports"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 
diff --git a/plc4go/internal/bacnetip/MessageCodec_plc4xgen.go b/plc4go/internal/bacnetip/MessageCodec_plc4xgen.go
index 21c073a..8bdebd9 100644
--- a/plc4go/internal/bacnetip/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/bacnetip/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package bacnetip
 
diff --git a/plc4go/internal/bacnetip/Subscriber.go b/plc4go/internal/bacnetip/Subscriber.go
index 864e323..5b44fcb 100644
--- a/plc4go/internal/bacnetip/Subscriber.go
+++ b/plc4go/internal/bacnetip/Subscriber.go
@@ -30,7 +30,7 @@
 	"github.com/apache/plc4x/plc4go/spi/options"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Subscriber
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Subscriber
 type Subscriber struct {
 	connection *Connection
 	consumers  map[*spiModel.DefaultPlcConsumerRegistration]apiModel.PlcSubscriptionEventConsumer
diff --git a/plc4go/internal/bacnetip/Subscriber_plc4xgen.go b/plc4go/internal/bacnetip/Subscriber_plc4xgen.go
index d638cab..cb4be8a 100644
--- a/plc4go/internal/bacnetip/Subscriber_plc4xgen.go
+++ b/plc4go/internal/bacnetip/Subscriber_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Subscriber"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Subscriber"; DO NOT EDIT.
 
 package bacnetip
 
diff --git a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go
index 52e48ad..241faae 100644
--- a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go
+++ b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go
@@ -24,7 +24,7 @@
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=BIPSimpleApplication -prefix=app_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=BIPSimpleApplication -prefix=app_
 type BIPSimpleApplication struct {
 	*ApplicationIOController
 	*WhoIsIAmServices
diff --git a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go
index c38a7eb..7745dcf 100644
--- a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=BIPSimpleApplication -prefix=app_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=BIPSimpleApplication -prefix=app_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo.go b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo.go
index 2a08b3e..14713df 100644
--- a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo.go
+++ b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo.go
@@ -21,7 +21,7 @@
 
 import readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=DeviceInfo -prefix=app_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=DeviceInfo -prefix=app_
 type DeviceInfo struct {
 	DeviceIdentifier readWriteModel.BACnetTagPayloadObjectIdentifier
 	Address          Address
diff --git a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go
index e588017..7b336d0 100644
--- a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DeviceInfo -prefix=app_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DeviceInfo -prefix=app_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/capability.go b/plc4go/internal/bacnetip/bacgopes/capability.go
index ccfbd39..7d5ab6c 100644
--- a/plc4go/internal/bacnetip/bacgopes/capability.go
+++ b/plc4go/internal/bacnetip/bacgopes/capability.go
@@ -23,7 +23,7 @@
 
 // TODO: implement
 //
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=Capability -prefix=capability_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=Capability -prefix=capability_
 type Capability struct {
 }
 
diff --git a/plc4go/internal/bacnetip/bacgopes/capability_Capability_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/capability_Capability_plc4xgen.go
index ad95359..7fab80d 100644
--- a/plc4go/internal/bacnetip/bacgopes/capability_Capability_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/capability_Capability_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Capability -prefix=capability_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Capability -prefix=capability_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go
index 572665c..01a5a9a 100644
--- a/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=WhoIsIAmServices -prefix=device_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=WhoIsIAmServices -prefix=device_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB.go
index 7e89b41..7956a8e 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB.go
@@ -74,7 +74,7 @@
 var _identNext = 1
 var _identLock sync.Mutex
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOCB -prefix=iocb_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=IOCB -prefix=iocb_
 type IOCB struct {
 	ioID           int
 	request        PDU
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
index e75e893..26d53da 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=IOCB -prefix=iocb_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=IOCB -prefix=iocb_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOController.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOController.go
index d6070a2..c53fbb5 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOController.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOController.go
@@ -52,7 +52,7 @@
 	AbortIO(iocb _IOCB, err error) error
 }
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOController -prefix=iocb_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=IOController -prefix=iocb_
 type IOController struct {
 	name         string
 	requirements IOControllerRequirements
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOController_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOController_plc4xgen.go
index dc2df47..e4e458e 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOController_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOController_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=IOController -prefix=iocb_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=IOController -prefix=iocb_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController.go
index 637f7b2..5fe58be 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController.go
@@ -31,7 +31,7 @@
 	ProcessIO(iocb _IOCB) error
 }
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOQController -prefix=iocb_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=IOQController -prefix=iocb_
 type IOQController struct {
 	*IOController
 	state      IOQControllerStates
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go
index 17d31c3..dfe43b7 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=IOQController -prefix=iocb_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=IOQController -prefix=iocb_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue.go
index 2379b92..642ca00 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue.go
@@ -30,7 +30,7 @@
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOQueue -prefix=iocb_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=IOQueue -prefix=iocb_
 type IOQueue struct {
 	name     string
 	notEmpty sync.Cond
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue_plc4xgen.go
index 7cabc67..d974223 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=IOQueue -prefix=iocb_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=IOQueue -prefix=iocb_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue.go b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue.go
index 8b748ba..7a8467e 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue.go
@@ -24,7 +24,7 @@
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=SieveQueue -prefix=iocb_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=SieveQueue -prefix=iocb_
 type SieveQueue struct {
 	*IOQController
 	requestFn func(apdu PDU)
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go
index 2686651..64a0b5b 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=SieveQueue -prefix=iocb_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=SieveQueue -prefix=iocb_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices.go b/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices.go
index 5e9ebcf..19a76cb 100644
--- a/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices.go
+++ b/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices.go
@@ -19,7 +19,7 @@
 
 package bacgopes
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=ReadWritePropertyServices -prefix=object_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=ReadWritePropertyServices -prefix=object_
 type ReadWritePropertyServices struct {
 }
 
diff --git a/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices_plc4xgen.go
index d3d6733..93f3b2b 100644
--- a/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=ReadWritePropertyServices -prefix=object_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=ReadWritePropertyServices -prefix=object_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/bacnetip/bacgopes/service_device_Device.go b/plc4go/internal/bacnetip/bacgopes/service_device_Device.go
index 3b3a12b..b496564 100644
--- a/plc4go/internal/bacnetip/bacgopes/service_device_Device.go
+++ b/plc4go/internal/bacnetip/bacgopes/service_device_Device.go
@@ -33,7 +33,7 @@
 	Request(args Args, kwargs KWArgs) error
 }
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=WhoIsIAmServices -prefix=device_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=WhoIsIAmServices -prefix=device_
 type WhoIsIAmServices struct {
 	_requirements WhoIsIAmServicesRequirements
 	*Capability
diff --git a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor.go b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor.go
index 6b01a8a..f26faa2 100644
--- a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor.go
+++ b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor.go
@@ -25,7 +25,7 @@
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=UDPActor -prefix=udp_
+//go:generate go run ../../../tools/plc4xGenerator/main.go -type=UDPActor -prefix=udp_
 type UDPActor struct {
 	director *UDPDirector
 	timeout  uint32
diff --git a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go
index 8bf2006..d9752b3 100644
--- a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=UDPActor -prefix=udp_"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=UDPActor -prefix=udp_"; DO NOT EDIT.
 
 package bacgopes
 
diff --git a/plc4go/internal/cbus/AlphaGenerator_plc4xgen.go b/plc4go/internal/cbus/AlphaGenerator_plc4xgen.go
index 8a7bde9..48c0310 100644
--- a/plc4go/internal/cbus/AlphaGenerator_plc4xgen.go
+++ b/plc4go/internal/cbus/AlphaGenerator_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=AlphaGenerator"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=AlphaGenerator"; DO NOT EDIT.
 
 package cbus
 
diff --git a/plc4go/internal/cbus/Configuration.go b/plc4go/internal/cbus/Configuration.go
index 2319013..feb040b 100644
--- a/plc4go/internal/cbus/Configuration.go
+++ b/plc4go/internal/cbus/Configuration.go
@@ -29,7 +29,7 @@
 	"golang.org/x/text/language"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Configuration
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Configuration
 type Configuration struct {
 	Srchk    bool
 	Exstat   bool
diff --git a/plc4go/internal/cbus/Configuration_plc4xgen.go b/plc4go/internal/cbus/Configuration_plc4xgen.go
index 9bbb465..bf68bcf 100644
--- a/plc4go/internal/cbus/Configuration_plc4xgen.go
+++ b/plc4go/internal/cbus/Configuration_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Configuration"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Configuration"; DO NOT EDIT.
 
 package cbus
 
diff --git a/plc4go/internal/cbus/Connection.go b/plc4go/internal/cbus/Connection.go
index caafb41..c12d08b 100644
--- a/plc4go/internal/cbus/Connection.go
+++ b/plc4go/internal/cbus/Connection.go
@@ -40,7 +40,7 @@
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=AlphaGenerator
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=AlphaGenerator
 type AlphaGenerator struct {
 	currentAlpha byte `hasLocker:"lock"`
 	lock         sync.Mutex
@@ -58,7 +58,7 @@
 	return result
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Connection
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Connection
 type Connection struct {
 	_default.DefaultConnection
 	alphaGenerator AlphaGenerator `stringer:"true"`
diff --git a/plc4go/internal/cbus/Connection_plc4xgen.go b/plc4go/internal/cbus/Connection_plc4xgen.go
index 3d36cc7..af9fb94 100644
--- a/plc4go/internal/cbus/Connection_plc4xgen.go
+++ b/plc4go/internal/cbus/Connection_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Connection"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Connection"; DO NOT EDIT.
 
 package cbus
 
diff --git a/plc4go/internal/cbus/DriverContext.go b/plc4go/internal/cbus/DriverContext.go
index 041f421..103cd8c 100644
--- a/plc4go/internal/cbus/DriverContext.go
+++ b/plc4go/internal/cbus/DriverContext.go
@@ -19,7 +19,7 @@
 
 package cbus
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DriverContext
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DriverContext
 type DriverContext struct {
 	awaitSetupComplete      bool
 	awaitDisconnectComplete bool
diff --git a/plc4go/internal/cbus/DriverContext_plc4xgen.go b/plc4go/internal/cbus/DriverContext_plc4xgen.go
index 5e80de0..b2ac0f0 100644
--- a/plc4go/internal/cbus/DriverContext_plc4xgen.go
+++ b/plc4go/internal/cbus/DriverContext_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DriverContext"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DriverContext"; DO NOT EDIT.
 
 package cbus
 
diff --git a/plc4go/internal/cbus/MessageCodec.go b/plc4go/internal/cbus/MessageCodec.go
index 199d678..64361a2 100644
--- a/plc4go/internal/cbus/MessageCodec.go
+++ b/plc4go/internal/cbus/MessageCodec.go
@@ -36,7 +36,7 @@
 	"github.com/apache/plc4x/plc4go/spi/transports"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 
diff --git a/plc4go/internal/cbus/MessageCodec_plc4xgen.go b/plc4go/internal/cbus/MessageCodec_plc4xgen.go
index ec7835b..bc26629 100644
--- a/plc4go/internal/cbus/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/cbus/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package cbus
 
diff --git a/plc4go/internal/cbus/Subscriber.go b/plc4go/internal/cbus/Subscriber.go
index 17add1e..2e8195f 100644
--- a/plc4go/internal/cbus/Subscriber.go
+++ b/plc4go/internal/cbus/Subscriber.go
@@ -38,7 +38,7 @@
 	spiValues "github.com/apache/plc4x/plc4go/spi/values"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Subscriber
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Subscriber
 type Subscriber struct {
 	consumers     map[*spiModel.DefaultPlcConsumerRegistration]apiModel.PlcSubscriptionEventConsumer `hasLocker:"consumersMutex"`
 	addSubscriber func(subscriber *Subscriber)
diff --git a/plc4go/internal/cbus/Subscriber_plc4xgen.go b/plc4go/internal/cbus/Subscriber_plc4xgen.go
index 7ca2061..2527ece 100644
--- a/plc4go/internal/cbus/Subscriber_plc4xgen.go
+++ b/plc4go/internal/cbus/Subscriber_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Subscriber"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Subscriber"; DO NOT EDIT.
 
 package cbus
 
diff --git a/plc4go/internal/cbus/Tag.go b/plc4go/internal/cbus/Tag.go
index 988e250..ebd1333 100644
--- a/plc4go/internal/cbus/Tag.go
+++ b/plc4go/internal/cbus/Tag.go
@@ -33,7 +33,7 @@
 )
 
 //go:generate stringer -type StatusRequestType
-//go:generate go run ../../tools/plc4xlicenser/gen.go -type=StatusRequestType
+//go:generate go run ../../tools/plc4xLicenser/main.go -type=StatusRequestType
 type StatusRequestType uint8
 
 const (
diff --git a/plc4go/internal/cbus/TagHandler.go b/plc4go/internal/cbus/TagHandler.go
index d5dce3c..2a379bc 100644
--- a/plc4go/internal/cbus/TagHandler.go
+++ b/plc4go/internal/cbus/TagHandler.go
@@ -36,7 +36,7 @@
 type TagType uint8
 
 //go:generate stringer -type TagType
-//go:generate go run ../../tools/plc4xlicenser/gen.go -type=TagType
+//go:generate go run ../../tools/plc4xLicenser/main.go -type=TagType
 const (
 	STATUS    TagType = iota
 	CAL_RESET         /* TODO: implement me*/
diff --git a/plc4go/internal/eip/MessageCodec.go b/plc4go/internal/eip/MessageCodec.go
index 68a1d85..377562d 100644
--- a/plc4go/internal/eip/MessageCodec.go
+++ b/plc4go/internal/eip/MessageCodec.go
@@ -34,7 +34,7 @@
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 	none bool // TODO: just a empty field to satisfy generator (needs fixing because in this case here we have the delegate)
diff --git a/plc4go/internal/eip/MessageCodec_plc4xgen.go b/plc4go/internal/eip/MessageCodec_plc4xgen.go
index d9e5dc7..87e4e05 100644
--- a/plc4go/internal/eip/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/eip/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package eip
 
diff --git a/plc4go/internal/knxnetip/Connection.go b/plc4go/internal/knxnetip/Connection.go
index 059671e..0bf0913 100644
--- a/plc4go/internal/knxnetip/Connection.go
+++ b/plc4go/internal/knxnetip/Connection.go
@@ -46,7 +46,7 @@
 	"github.com/apache/plc4x/plc4go/spi/transports"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=ConnectionMetadata
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=ConnectionMetadata
 type ConnectionMetadata struct {
 	KnxMedium         driverModel.KnxMedium `stringer:"true"`
 	GatewayName       string
diff --git a/plc4go/internal/knxnetip/ConnectionMetadata_plc4xgen.go b/plc4go/internal/knxnetip/ConnectionMetadata_plc4xgen.go
index c26064a..98db62a 100644
--- a/plc4go/internal/knxnetip/ConnectionMetadata_plc4xgen.go
+++ b/plc4go/internal/knxnetip/ConnectionMetadata_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=ConnectionMetadata"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=ConnectionMetadata"; DO NOT EDIT.
 
 package knxnetip
 
diff --git a/plc4go/internal/knxnetip/MessageCodec.go b/plc4go/internal/knxnetip/MessageCodec.go
index 9779a0c..7a9f1dc 100644
--- a/plc4go/internal/knxnetip/MessageCodec.go
+++ b/plc4go/internal/knxnetip/MessageCodec.go
@@ -32,7 +32,7 @@
 	"github.com/apache/plc4x/plc4go/spi/transports"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 	sequenceCounter    int32
diff --git a/plc4go/internal/knxnetip/MessageCodec_plc4xgen.go b/plc4go/internal/knxnetip/MessageCodec_plc4xgen.go
index dfa1fed..4947e73 100644
--- a/plc4go/internal/knxnetip/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/knxnetip/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package knxnetip
 
diff --git a/plc4go/internal/knxnetip/Subscriber.go b/plc4go/internal/knxnetip/Subscriber.go
index 0a1c566..d85d143 100644
--- a/plc4go/internal/knxnetip/Subscriber.go
+++ b/plc4go/internal/knxnetip/Subscriber.go
@@ -36,7 +36,7 @@
 	spiValues "github.com/apache/plc4x/plc4go/spi/values"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Subscriber
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Subscriber
 type Subscriber struct {
 	connection *Connection
 	consumers  map[*spiModel.DefaultPlcConsumerRegistration]apiModel.PlcSubscriptionEventConsumer
diff --git a/plc4go/internal/knxnetip/Subscriber_plc4xgen.go b/plc4go/internal/knxnetip/Subscriber_plc4xgen.go
index e86c757..432806d 100644
--- a/plc4go/internal/knxnetip/Subscriber_plc4xgen.go
+++ b/plc4go/internal/knxnetip/Subscriber_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Subscriber"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Subscriber"; DO NOT EDIT.
 
 package knxnetip
 
diff --git a/plc4go/internal/modbus/MessageCodec.go b/plc4go/internal/modbus/MessageCodec.go
index 1141703..c47cb60 100644
--- a/plc4go/internal/modbus/MessageCodec.go
+++ b/plc4go/internal/modbus/MessageCodec.go
@@ -32,7 +32,7 @@
 	"github.com/apache/plc4x/plc4go/spi/transports"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 	expectationCounter int32
diff --git a/plc4go/internal/modbus/MessageCodec_plc4xgen.go b/plc4go/internal/modbus/MessageCodec_plc4xgen.go
index ad20218..4cf5ec4 100644
--- a/plc4go/internal/modbus/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/modbus/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package modbus
 
diff --git a/plc4go/internal/modbus/TagHandler.go b/plc4go/internal/modbus/TagHandler.go
index 29e7deb..c0b0343 100644
--- a/plc4go/internal/modbus/TagHandler.go
+++ b/plc4go/internal/modbus/TagHandler.go
@@ -35,7 +35,7 @@
 type TagType uint8
 
 //go:generate stringer -type TagType
-//go:generate go run ../../tools/plc4xlicenser/gen.go -type=TagType
+//go:generate go run ../../tools/plc4xLicenser/main.go -type=TagType
 const (
 	Coil             TagType = 0x00
 	DiscreteInput    TagType = 0x01
diff --git a/plc4go/internal/opcua/Configuration.go b/plc4go/internal/opcua/Configuration.go
index 70b2fe5..a76dfba 100644
--- a/plc4go/internal/opcua/Configuration.go
+++ b/plc4go/internal/opcua/Configuration.go
@@ -33,7 +33,7 @@
 	readWriteModel "github.com/apache/plc4x/plc4go/protocols/opcua/readwrite/model"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Configuration
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Configuration
 type Configuration struct {
 	Code              string
 	Host              string
diff --git a/plc4go/internal/opcua/Configuration_plc4xgen.go b/plc4go/internal/opcua/Configuration_plc4xgen.go
index e742afe..7fc0cd1 100644
--- a/plc4go/internal/opcua/Configuration_plc4xgen.go
+++ b/plc4go/internal/opcua/Configuration_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Configuration"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Configuration"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/opcua/Connection.go b/plc4go/internal/opcua/Connection.go
index a95d1e9..20fb5fd 100644
--- a/plc4go/internal/opcua/Connection.go
+++ b/plc4go/internal/opcua/Connection.go
@@ -36,7 +36,7 @@
 	"github.com/apache/plc4x/plc4go/spi/tracer"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Connection
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Connection
 type Connection struct {
 	_default.DefaultConnection
 	messageCodec *MessageCodec
diff --git a/plc4go/internal/opcua/Connection_plc4xgen.go b/plc4go/internal/opcua/Connection_plc4xgen.go
index 61fcb7b..1efc257 100644
--- a/plc4go/internal/opcua/Connection_plc4xgen.go
+++ b/plc4go/internal/opcua/Connection_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Connection"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Connection"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/opcua/DriverContext.go b/plc4go/internal/opcua/DriverContext.go
index 284aa9f..d1fa62c 100644
--- a/plc4go/internal/opcua/DriverContext.go
+++ b/plc4go/internal/opcua/DriverContext.go
@@ -19,7 +19,7 @@
 
 package opcua
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DriverContext
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DriverContext
 type DriverContext struct {
 	fireDiscoverEvent            bool
 	awaitSetupComplete           bool
diff --git a/plc4go/internal/opcua/DriverContext_plc4xgen.go b/plc4go/internal/opcua/DriverContext_plc4xgen.go
index e6c003c..9898cd8 100644
--- a/plc4go/internal/opcua/DriverContext_plc4xgen.go
+++ b/plc4go/internal/opcua/DriverContext_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DriverContext"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DriverContext"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/opcua/MessageCodec.go b/plc4go/internal/opcua/MessageCodec.go
index 63263e1..5bd3db7 100644
--- a/plc4go/internal/opcua/MessageCodec.go
+++ b/plc4go/internal/opcua/MessageCodec.go
@@ -35,7 +35,7 @@
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 
diff --git a/plc4go/internal/opcua/MessageCodec_plc4xgen.go b/plc4go/internal/opcua/MessageCodec_plc4xgen.go
index a6944c2..53423e1 100644
--- a/plc4go/internal/opcua/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/opcua/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/opcua/SecureChannel.go b/plc4go/internal/opcua/SecureChannel.go
index 39b5368..d7024a8 100644
--- a/plc4go/internal/opcua/SecureChannel.go
+++ b/plc4go/internal/opcua/SecureChannel.go
@@ -80,7 +80,7 @@
 	DEFAULT_CONNECTION_LIFETIME = uint32(36000000)
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=SecureChannel
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=SecureChannel
 type SecureChannel struct {
 	sessionName               string
 	clientNonce               []byte
diff --git a/plc4go/internal/opcua/SecureChannelTransactionManager.go b/plc4go/internal/opcua/SecureChannelTransactionManager.go
index 13a38bd..6c4898e 100644
--- a/plc4go/internal/opcua/SecureChannelTransactionManager.go
+++ b/plc4go/internal/opcua/SecureChannelTransactionManager.go
@@ -27,7 +27,7 @@
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=SecureChannelTransactionManager
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=SecureChannelTransactionManager
 type SecureChannelTransactionManager struct {
 	transactionIdentifierGenerator atomic.Int32
 	requestIdentifierGenerator     atomic.Int32
diff --git a/plc4go/internal/opcua/SecureChannelTransactionManager_plc4xgen.go b/plc4go/internal/opcua/SecureChannelTransactionManager_plc4xgen.go
index f5b210b..9b0d46b 100644
--- a/plc4go/internal/opcua/SecureChannelTransactionManager_plc4xgen.go
+++ b/plc4go/internal/opcua/SecureChannelTransactionManager_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=SecureChannelTransactionManager"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=SecureChannelTransactionManager"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/opcua/SecureChannel_plc4xgen.go b/plc4go/internal/opcua/SecureChannel_plc4xgen.go
index 043a1ff..a3d24e2 100644
--- a/plc4go/internal/opcua/SecureChannel_plc4xgen.go
+++ b/plc4go/internal/opcua/SecureChannel_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=SecureChannel"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=SecureChannel"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/opcua/Subscriber.go b/plc4go/internal/opcua/Subscriber.go
index 9c5b18e..891f8f3 100644
--- a/plc4go/internal/opcua/Subscriber.go
+++ b/plc4go/internal/opcua/Subscriber.go
@@ -37,7 +37,7 @@
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=Subscriber
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=Subscriber
 type Subscriber struct {
 	consumers     map[*spiModel.DefaultPlcConsumerRegistration]apiModel.PlcSubscriptionEventConsumer
 	addSubscriber func(subscriber *Subscriber)
diff --git a/plc4go/internal/opcua/Subscriber_plc4xgen.go b/plc4go/internal/opcua/Subscriber_plc4xgen.go
index 0b67ed9..389ae5a 100644
--- a/plc4go/internal/opcua/Subscriber_plc4xgen.go
+++ b/plc4go/internal/opcua/Subscriber_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=Subscriber"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=Subscriber"; DO NOT EDIT.
 
 package opcua
 
diff --git a/plc4go/internal/s7/MessageCodec.go b/plc4go/internal/s7/MessageCodec.go
index 67d1f1e..90af874 100644
--- a/plc4go/internal/s7/MessageCodec.go
+++ b/plc4go/internal/s7/MessageCodec.go
@@ -32,7 +32,7 @@
 	"github.com/apache/plc4x/plc4go/spi/transports"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=MessageCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=MessageCodec
 type MessageCodec struct {
 	_default.DefaultCodec
 
diff --git a/plc4go/internal/s7/MessageCodec_plc4xgen.go b/plc4go/internal/s7/MessageCodec_plc4xgen.go
index c7e7dff..fa527c1 100644
--- a/plc4go/internal/s7/MessageCodec_plc4xgen.go
+++ b/plc4go/internal/s7/MessageCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=MessageCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=MessageCodec"; DO NOT EDIT.
 
 package s7
 
diff --git a/plc4go/internal/s7/TagHandler.go b/plc4go/internal/s7/TagHandler.go
index 70a09df..ef52198 100644
--- a/plc4go/internal/s7/TagHandler.go
+++ b/plc4go/internal/s7/TagHandler.go
@@ -39,7 +39,7 @@
 type TagType uint8
 
 //go:generate stringer -type TagType
-//go:generate go run ../../tools/plc4xlicenser/gen.go -type=TagType
+//go:generate go run ../../tools/plc4xLicenser/main.go -type=TagType
 const (
 	S7Tag       TagType = 0x00
 	S7StringTag TagType = 0x01
diff --git a/plc4go/pkg/api/PlcConnectionConnectResult.go b/plc4go/pkg/api/PlcConnectionConnectResult.go
index 0fec6e8..63b0dbe 100644
--- a/plc4go/pkg/api/PlcConnectionConnectResult.go
+++ b/plc4go/pkg/api/PlcConnectionConnectResult.go
@@ -33,7 +33,7 @@
 // Internal section
 //
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=plcConnectionConnectResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=plcConnectionConnectResult
 type plcConnectionConnectResult struct {
 	connection PlcConnection
 	err        error
diff --git a/plc4go/pkg/api/PlcDriverManager.go b/plc4go/pkg/api/PlcDriverManager.go
index 5221751..e341151 100644
--- a/plc4go/pkg/api/PlcDriverManager.go
+++ b/plc4go/pkg/api/PlcDriverManager.go
@@ -106,7 +106,7 @@
 // Internal section
 //
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=plcDriverManger
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=plcDriverManger
 type plcDriverManger struct {
 	drivers    map[string]PlcDriver
 	transports map[string]transports.Transport
diff --git a/plc4go/pkg/api/model/plc_subscription.go b/plc4go/pkg/api/model/plc_subscription.go
index 9d20a39..66880da 100644
--- a/plc4go/pkg/api/model/plc_subscription.go
+++ b/plc4go/pkg/api/model/plc_subscription.go
@@ -28,7 +28,7 @@
 )
 
 //go:generate stringer -type PlcSubscriptionType
-//go:generate go run ../../../tools/plc4xlicenser/gen.go -type=PlcSubscriptionType
+//go:generate go run ../../../tools/plc4xLicenser/main.go -type=PlcSubscriptionType
 type PlcSubscriptionType uint8
 
 const (
diff --git a/plc4go/pkg/api/plcConnectionConnectResult_plc4xgen.go b/plc4go/pkg/api/plcConnectionConnectResult_plc4xgen.go
index 54de4aa..c200640 100644
--- a/plc4go/pkg/api/plcConnectionConnectResult_plc4xgen.go
+++ b/plc4go/pkg/api/plcConnectionConnectResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=plcConnectionConnectResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=plcConnectionConnectResult"; DO NOT EDIT.
 
 package plc4go
 
diff --git a/plc4go/pkg/api/plcDriverManger_plc4xgen.go b/plc4go/pkg/api/plcDriverManger_plc4xgen.go
index 4249f0c..15337f9 100644
--- a/plc4go/pkg/api/plcDriverManger_plc4xgen.go
+++ b/plc4go/pkg/api/plcDriverManger_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=plcDriverManger"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=plcDriverManger"; DO NOT EDIT.
 
 package plc4go
 
diff --git a/plc4go/spi/default/DefaultCodec.go b/plc4go/spi/default/DefaultCodec.go
index 14df0a0..7484f58 100644
--- a/plc4go/spi/default/DefaultCodec.go
+++ b/plc4go/spi/default/DefaultCodec.go
@@ -72,7 +72,7 @@
 	customMessageHandler func(codec DefaultCodecRequirements, message spi.Message) bool
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=defaultCodec
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=defaultCodec
 type defaultCodec struct {
 	DefaultCodecRequirements `ignore:"true"`
 
diff --git a/plc4go/spi/default/DefaultConnection.go b/plc4go/spi/default/DefaultConnection.go
index 5f9d7f0..2166701 100644
--- a/plc4go/spi/default/DefaultConnection.go
+++ b/plc4go/spi/default/DefaultConnection.go
@@ -97,7 +97,7 @@
 	plcValueHandler spi.PlcValueHandler
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=defaultConnection
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=defaultConnection
 type defaultConnection struct {
 	DefaultConnectionRequirements `ignore:"true"`
 	// defaultTtl the time to live after a close
diff --git a/plc4go/spi/default/DefaultConnectionMetadata.go b/plc4go/spi/default/DefaultConnectionMetadata.go
index cbdf8ac..9b2406f 100644
--- a/plc4go/spi/default/DefaultConnectionMetadata.go
+++ b/plc4go/spi/default/DefaultConnectionMetadata.go
@@ -21,7 +21,7 @@
 
 // DefaultConnectionMetadata implements the model.PlcConnectionMetadata interface
 //
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultConnectionMetadata
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultConnectionMetadata
 type DefaultConnectionMetadata struct {
 	ConnectionAttributes map[string]string
 	ProvidesReading      bool
diff --git a/plc4go/spi/default/DefaultConnectionMetadata_plc4xgen.go b/plc4go/spi/default/DefaultConnectionMetadata_plc4xgen.go
index 86ee963..d1fff89 100644
--- a/plc4go/spi/default/DefaultConnectionMetadata_plc4xgen.go
+++ b/plc4go/spi/default/DefaultConnectionMetadata_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultConnectionMetadata"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultConnectionMetadata"; DO NOT EDIT.
 
 package _default
 
diff --git a/plc4go/spi/default/DefaultPlcConnectionCloseResult.go b/plc4go/spi/default/DefaultPlcConnectionCloseResult.go
index 5299a38..696f641 100644
--- a/plc4go/spi/default/DefaultPlcConnectionCloseResult.go
+++ b/plc4go/spi/default/DefaultPlcConnectionCloseResult.go
@@ -45,7 +45,7 @@
 	}
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=defaultPlcConnectionCloseResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=defaultPlcConnectionCloseResult
 type defaultPlcConnectionCloseResult struct {
 	connection plc4go.PlcConnection
 	err        error
diff --git a/plc4go/spi/default/DefaultPlcConnectionConnectResult.go b/plc4go/spi/default/DefaultPlcConnectionConnectResult.go
index c0b50ff..4614267 100644
--- a/plc4go/spi/default/DefaultPlcConnectionConnectResult.go
+++ b/plc4go/spi/default/DefaultPlcConnectionConnectResult.go
@@ -32,7 +32,7 @@
 	}
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=defaultPlcConnectionConnectResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=defaultPlcConnectionConnectResult
 type defaultPlcConnectionConnectResult struct {
 	connection plc4go.PlcConnection
 	err        error
diff --git a/plc4go/spi/default/DefaultPlcConnectionPingResult.go b/plc4go/spi/default/DefaultPlcConnectionPingResult.go
index e666d62..9c8577d 100644
--- a/plc4go/spi/default/DefaultPlcConnectionPingResult.go
+++ b/plc4go/spi/default/DefaultPlcConnectionPingResult.go
@@ -31,7 +31,7 @@
 	}
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=defaultPlcConnectionPingResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=defaultPlcConnectionPingResult
 type defaultPlcConnectionPingResult struct {
 	err error
 }
diff --git a/plc4go/spi/default/defaultCodec_plc4xgen.go b/plc4go/spi/default/defaultCodec_plc4xgen.go
index bd631b8..a815bcb 100644
--- a/plc4go/spi/default/defaultCodec_plc4xgen.go
+++ b/plc4go/spi/default/defaultCodec_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=defaultCodec"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=defaultCodec"; DO NOT EDIT.
 
 package _default
 
diff --git a/plc4go/spi/default/defaultConnection_plc4xgen.go b/plc4go/spi/default/defaultConnection_plc4xgen.go
index 5588ed5..651282a 100644
--- a/plc4go/spi/default/defaultConnection_plc4xgen.go
+++ b/plc4go/spi/default/defaultConnection_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=defaultConnection"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=defaultConnection"; DO NOT EDIT.
 
 package _default
 
diff --git a/plc4go/spi/default/defaultPlcConnectionCloseResult_plc4xgen.go b/plc4go/spi/default/defaultPlcConnectionCloseResult_plc4xgen.go
index c76d370..b45dcc4 100644
--- a/plc4go/spi/default/defaultPlcConnectionCloseResult_plc4xgen.go
+++ b/plc4go/spi/default/defaultPlcConnectionCloseResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=defaultPlcConnectionCloseResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=defaultPlcConnectionCloseResult"; DO NOT EDIT.
 
 package _default
 
diff --git a/plc4go/spi/default/defaultPlcConnectionConnectResult_plc4xgen.go b/plc4go/spi/default/defaultPlcConnectionConnectResult_plc4xgen.go
index 631a727..6715808 100644
--- a/plc4go/spi/default/defaultPlcConnectionConnectResult_plc4xgen.go
+++ b/plc4go/spi/default/defaultPlcConnectionConnectResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=defaultPlcConnectionConnectResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=defaultPlcConnectionConnectResult"; DO NOT EDIT.
 
 package _default
 
diff --git a/plc4go/spi/default/defaultPlcConnectionPingResult_plc4xgen.go b/plc4go/spi/default/defaultPlcConnectionPingResult_plc4xgen.go
index 093051c..05edcb9 100644
--- a/plc4go/spi/default/defaultPlcConnectionPingResult_plc4xgen.go
+++ b/plc4go/spi/default/defaultPlcConnectionPingResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=defaultPlcConnectionPingResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=defaultPlcConnectionPingResult"; DO NOT EDIT.
 
 package _default
 
diff --git a/plc4go/spi/interceptors/SingleItemRequestInterceptor.go b/plc4go/spi/interceptors/SingleItemRequestInterceptor.go
index 456d5e3..bedf434 100644
--- a/plc4go/spi/interceptors/SingleItemRequestInterceptor.go
+++ b/plc4go/spi/interceptors/SingleItemRequestInterceptor.go
@@ -98,7 +98,7 @@
 // Internal section
 //
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=interceptedPlcReadRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=interceptedPlcReadRequestResult
 type interceptedPlcReadRequestResult struct {
 	Request  apiModel.PlcReadRequest
 	Response apiModel.PlcReadResponse
@@ -117,7 +117,7 @@
 	return d.Err
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=interceptedPlcWriteRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=interceptedPlcWriteRequestResult
 type interceptedPlcWriteRequestResult struct {
 	Request  apiModel.PlcWriteRequest
 	Response apiModel.PlcWriteResponse
diff --git a/plc4go/spi/interceptors/interceptedPlcReadRequestResult_plc4xgen.go b/plc4go/spi/interceptors/interceptedPlcReadRequestResult_plc4xgen.go
index f451da7..6ed7864 100644
--- a/plc4go/spi/interceptors/interceptedPlcReadRequestResult_plc4xgen.go
+++ b/plc4go/spi/interceptors/interceptedPlcReadRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=interceptedPlcReadRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=interceptedPlcReadRequestResult"; DO NOT EDIT.
 
 package interceptors
 
diff --git a/plc4go/spi/interceptors/interceptedPlcWriteRequestResult_plc4xgen.go b/plc4go/spi/interceptors/interceptedPlcWriteRequestResult_plc4xgen.go
index 252ef41..b7e4d53 100644
--- a/plc4go/spi/interceptors/interceptedPlcWriteRequestResult_plc4xgen.go
+++ b/plc4go/spi/interceptors/interceptedPlcWriteRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=interceptedPlcWriteRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=interceptedPlcWriteRequestResult"; DO NOT EDIT.
 
 package interceptors
 
diff --git a/plc4go/spi/model/DefaultArrayInfo.go b/plc4go/spi/model/DefaultArrayInfo.go
index 7db6e36..541b61c 100644
--- a/plc4go/spi/model/DefaultArrayInfo.go
+++ b/plc4go/spi/model/DefaultArrayInfo.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.ArrayInfo = &DefaultArrayInfo{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultArrayInfo
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultArrayInfo
 type DefaultArrayInfo struct {
 	LowerBound uint32
 	UpperBound uint32
diff --git a/plc4go/spi/model/DefaultArrayInfo_plc4xgen.go b/plc4go/spi/model/DefaultArrayInfo_plc4xgen.go
index 0301625..113969b 100644
--- a/plc4go/spi/model/DefaultArrayInfo_plc4xgen.go
+++ b/plc4go/spi/model/DefaultArrayInfo_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultArrayInfo"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultArrayInfo"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcBrowseItem.go b/plc4go/spi/model/DefaultPlcBrowseItem.go
index bb9784d..a5fbf47 100644
--- a/plc4go/spi/model/DefaultPlcBrowseItem.go
+++ b/plc4go/spi/model/DefaultPlcBrowseItem.go
@@ -26,7 +26,7 @@
 
 var _ apiModel.PlcBrowseItem = &DefaultPlcBrowseItem{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcBrowseItem
 type DefaultPlcBrowseItem struct {
 	Tag          apiModel.PlcTag
 	Name         string
diff --git a/plc4go/spi/model/DefaultPlcBrowseItem_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseItem_plc4xgen.go
index 0a6957b..1bc91a8 100644
--- a/plc4go/spi/model/DefaultPlcBrowseItem_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcBrowseItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcBrowseItem"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequest.go b/plc4go/spi/model/DefaultPlcBrowseRequest.go
index be3e212..2da22ae 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequest.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequest.go
@@ -30,7 +30,7 @@
 
 var _ apiModel.PlcBrowseRequestBuilder = &DefaultPlcBrowseRequestBuilder{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseRequestBuilder
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcBrowseRequestBuilder
 type DefaultPlcBrowseRequestBuilder struct {
 	tagHandler spi.PlcTagHandler `ignore:"true"`
 	browser    spi.PlcBrowser    `ignore:"true"`
@@ -67,7 +67,7 @@
 
 var _ apiModel.PlcBrowseRequest = &DefaultPlcBrowseRequest{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseRequest
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcBrowseRequest
 type DefaultPlcBrowseRequest struct {
 	browser    spi.PlcBrowser
 	queryNames []string
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go
index 4cc54b5..6068bfc 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcBrowseRequestBuilder"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcBrowseRequestBuilder"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequestResult.go b/plc4go/spi/model/DefaultPlcBrowseRequestResult.go
index 617f98b..bb2ab30 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequestResult.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequestResult.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.PlcBrowseRequestResult = &DefaultPlcBrowseRequestResult{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcBrowseRequestResult
 type DefaultPlcBrowseRequestResult struct {
 	Request  apiModel.PlcBrowseRequest
 	Response apiModel.PlcBrowseResponse
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go
index f77013b..d0f55a1 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcBrowseRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcBrowseRequestResult"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequest_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseRequest_plc4xgen.go
index 67c0611..c28d35f 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequest_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequest_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcBrowseRequest"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcBrowseRequest"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcBrowseResponse.go b/plc4go/spi/model/DefaultPlcBrowseResponse.go
index 0ec06c4..822cd08 100644
--- a/plc4go/spi/model/DefaultPlcBrowseResponse.go
+++ b/plc4go/spi/model/DefaultPlcBrowseResponse.go
@@ -25,7 +25,7 @@
 
 var _ apiModel.PlcDiscoveryItem = &DefaultPlcDiscoveryItem{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseResponse
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcBrowseResponse
 type DefaultPlcBrowseResponse struct {
 	request      apiModel.PlcBrowseRequest
 	responseCode apiModel.PlcResponseCode `stringer:"true"`
diff --git a/plc4go/spi/model/DefaultPlcBrowseResponseItem.go b/plc4go/spi/model/DefaultPlcBrowseResponseItem.go
index c553bf1..8a28bc3 100644
--- a/plc4go/spi/model/DefaultPlcBrowseResponseItem.go
+++ b/plc4go/spi/model/DefaultPlcBrowseResponseItem.go
@@ -23,7 +23,7 @@
 	apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseResponseItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcBrowseResponseItem
 type DefaultPlcBrowseResponseItem struct {
 	code    apiModel.PlcResponseCode `stringer:"true"`
 	results []apiModel.PlcBrowseItem
diff --git a/plc4go/spi/model/DefaultPlcBrowseResponseItem_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseResponseItem_plc4xgen.go
index 620f8ef..531f008 100644
--- a/plc4go/spi/model/DefaultPlcBrowseResponseItem_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseResponseItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcBrowseResponseItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcBrowseResponseItem"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcBrowseResponse_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseResponse_plc4xgen.go
index 2fea7ea..0811ec9 100644
--- a/plc4go/spi/model/DefaultPlcBrowseResponse_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseResponse_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcBrowseResponse"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcBrowseResponse"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcConsumerRegistration.go b/plc4go/spi/model/DefaultPlcConsumerRegistration.go
index 569b935..30ea840 100644
--- a/plc4go/spi/model/DefaultPlcConsumerRegistration.go
+++ b/plc4go/spi/model/DefaultPlcConsumerRegistration.go
@@ -28,7 +28,7 @@
 
 var _ apiModel.PlcConsumerRegistration = &DefaultPlcConsumerRegistration{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcConsumerRegistration
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcConsumerRegistration
 type DefaultPlcConsumerRegistration struct {
 	consumerId    int
 	consumer      apiModel.PlcSubscriptionEventConsumer `ignore:"true"` // Function not renderable
diff --git a/plc4go/spi/model/DefaultPlcConsumerRegistration_plc4xgen.go b/plc4go/spi/model/DefaultPlcConsumerRegistration_plc4xgen.go
index adcdb91..c27f0f3 100644
--- a/plc4go/spi/model/DefaultPlcConsumerRegistration_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcConsumerRegistration_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcConsumerRegistration"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcConsumerRegistration"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcDiscoveryItem.go b/plc4go/spi/model/DefaultPlcDiscoveryItem.go
index 69cc043..0dc88d6 100644
--- a/plc4go/spi/model/DefaultPlcDiscoveryItem.go
+++ b/plc4go/spi/model/DefaultPlcDiscoveryItem.go
@@ -29,7 +29,7 @@
 
 var _ apiModel.PlcBrowseResponse = &DefaultPlcBrowseResponse{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcDiscoveryItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcDiscoveryItem
 type DefaultPlcDiscoveryItem struct {
 	ProtocolCode  string
 	TransportCode string
diff --git a/plc4go/spi/model/DefaultPlcDiscoveryItem_plc4xgen.go b/plc4go/spi/model/DefaultPlcDiscoveryItem_plc4xgen.go
index 40f94cc..0b7421c 100644
--- a/plc4go/spi/model/DefaultPlcDiscoveryItem_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcDiscoveryItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcDiscoveryItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcDiscoveryItem"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcReadRequest.go b/plc4go/spi/model/DefaultPlcReadRequest.go
index d45b455..02881d7 100644
--- a/plc4go/spi/model/DefaultPlcReadRequest.go
+++ b/plc4go/spi/model/DefaultPlcReadRequest.go
@@ -33,7 +33,7 @@
 
 var _ apiModel.PlcReadRequestBuilder = &DefaultPlcReadRequestBuilder{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcReadRequestBuilder
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcReadRequestBuilder
 type DefaultPlcReadRequestBuilder struct {
 	reader                 spi.PlcReader     `ignore:"true"`
 	tagHandler             spi.PlcTagHandler `ignore:"true"`
@@ -88,7 +88,7 @@
 
 var _ apiModel.PlcReadRequest = &DefaultPlcReadRequest{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcReadRequest
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcReadRequest
 type DefaultPlcReadRequest struct {
 	*DefaultPlcTagRequest
 	reader                 spi.PlcReader                       `ignore:"true"`
diff --git a/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go
index 0d2bad9..16e032a 100644
--- a/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcReadRequestBuilder"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcReadRequestBuilder"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcReadRequestResult.go b/plc4go/spi/model/DefaultPlcReadRequestResult.go
index 414b773..0d7e323 100644
--- a/plc4go/spi/model/DefaultPlcReadRequestResult.go
+++ b/plc4go/spi/model/DefaultPlcReadRequestResult.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.PlcReadRequestResult = &DefaultPlcReadRequestResult{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcReadRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcReadRequestResult
 type DefaultPlcReadRequestResult struct {
 	Request  apiModel.PlcReadRequest
 	Response apiModel.PlcReadResponse
diff --git a/plc4go/spi/model/DefaultPlcReadRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcReadRequestResult_plc4xgen.go
index 0407b77..3f5561c 100644
--- a/plc4go/spi/model/DefaultPlcReadRequestResult_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcReadRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcReadRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcReadRequestResult"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcReadRequest_plc4xgen.go b/plc4go/spi/model/DefaultPlcReadRequest_plc4xgen.go
index 949b857..893860a 100644
--- a/plc4go/spi/model/DefaultPlcReadRequest_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcReadRequest_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcReadRequest"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcReadRequest"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcReadResponse.go b/plc4go/spi/model/DefaultPlcReadResponse.go
index 580b27a..46ba56b 100644
--- a/plc4go/spi/model/DefaultPlcReadResponse.go
+++ b/plc4go/spi/model/DefaultPlcReadResponse.go
@@ -27,7 +27,7 @@
 
 var _ apiModel.PlcReadResponse = &DefaultPlcReadResponse{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcReadResponse
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcReadResponse
 type DefaultPlcReadResponse struct {
 	request apiModel.PlcReadRequest
 	values  map[string]*ResponseItem
diff --git a/plc4go/spi/model/DefaultPlcReadResponse_plc4xgen.go b/plc4go/spi/model/DefaultPlcReadResponse_plc4xgen.go
index 6f99df9..b53dc1e 100644
--- a/plc4go/spi/model/DefaultPlcReadResponse_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcReadResponse_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcReadResponse"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcReadResponse"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionEvent.go b/plc4go/spi/model/DefaultPlcSubscriptionEvent.go
index eea2bb3..badbb0c 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionEvent.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionEvent.go
@@ -33,7 +33,7 @@
 
 var _ apiModel.PlcSubscriptionEvent = &DefaultPlcSubscriptionEvent{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionEvent
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionEvent
 type DefaultPlcSubscriptionEvent struct {
 	DefaultPlcSubscriptionEventRequirements `ignore:"true"` // Avoid recursion
 	values                                  map[string]*DefaultPlcSubscriptionEventItem
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionEventItem.go b/plc4go/spi/model/DefaultPlcSubscriptionEventItem.go
index 554d001..d4e5f3a 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionEventItem.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionEventItem.go
@@ -26,7 +26,7 @@
 	apiValues "github.com/apache/plc4x/plc4go/pkg/api/values"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionEventItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionEventItem
 type DefaultPlcSubscriptionEventItem struct {
 	code             apiModel.PlcResponseCode `stringer:"true"`
 	tag              apiModel.PlcTag
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionEventItem_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionEventItem_plc4xgen.go
index e67ef9e..5c84e93 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionEventItem_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionEventItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionEventItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionEventItem"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionEvent_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionEvent_plc4xgen.go
index 5366376..c088533 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionEvent_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionEvent_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionEvent"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionEvent"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionHandle.go b/plc4go/spi/model/DefaultPlcSubscriptionHandle.go
index 1fc64cb..8a6bbb9 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionHandle.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionHandle.go
@@ -26,7 +26,7 @@
 	"github.com/apache/plc4x/plc4go/spi"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionHandle
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionHandle
 type DefaultPlcSubscriptionHandle struct {
 	uuid             uuid.UUID                      `stringer:"true"`
 	handleToRegister apiModel.PlcSubscriptionHandle `ignore:"true"` // avoid recursion
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionHandle_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionHandle_plc4xgen.go
index e60b2c5..cfed960 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionHandle_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionHandle_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionHandle"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionHandle"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequest.go b/plc4go/spi/model/DefaultPlcSubscriptionRequest.go
index 3975c54..8142008 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequest.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequest.go
@@ -29,7 +29,7 @@
 	"github.com/apache/plc4x/plc4go/spi"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionRequestBuilder
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionRequestBuilder
 type DefaultPlcSubscriptionRequestBuilder struct {
 	subscriber             spi.PlcSubscriber   `ignore:"true"`
 	tagHandler             spi.PlcTagHandler   `ignore:"true"`
@@ -127,7 +127,7 @@
 	return NewDefaultPlcSubscriptionRequest(d.subscriber, d.tagNames, d.tags, d.types, d.intervals, d.preRegisteredConsumers), nil
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionRequest
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionRequest
 type DefaultPlcSubscriptionRequest struct {
 	*DefaultPlcTagRequest
 	types                  map[string]apiModel.PlcSubscriptionType
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go
index 73446bf..abf758b 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionRequestBuilder"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionRequestBuilder"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go
index eb9dce6..8baeb6e 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.PlcSubscriptionRequestResult = &DefaultPlcSubscriptionRequestResult{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionRequestResult
 type DefaultPlcSubscriptionRequestResult struct {
 	Request  apiModel.PlcSubscriptionRequest
 	Response apiModel.PlcSubscriptionResponse
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go
index aec528f..132dd3b 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionRequestResult"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequest_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionRequest_plc4xgen.go
index b49d6ac..51b13cb 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequest_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequest_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionRequest"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionRequest"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionResponse.go b/plc4go/spi/model/DefaultPlcSubscriptionResponse.go
index 2c946a6..cb0c211 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionResponse.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionResponse.go
@@ -28,7 +28,7 @@
 
 var _ apiModel.PlcSubscriptionResponse = &DefaultPlcSubscriptionResponse{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionResponse
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionResponse
 type DefaultPlcSubscriptionResponse struct {
 	request apiModel.PlcSubscriptionRequest
 	values  map[string]*DefaultPlcSubscriptionResponseItem
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionResponseItem.go b/plc4go/spi/model/DefaultPlcSubscriptionResponseItem.go
index 4f37da5..4cae7f4 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionResponseItem.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionResponseItem.go
@@ -23,7 +23,7 @@
 	apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionResponseItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionResponseItem
 type DefaultPlcSubscriptionResponseItem struct {
 	code               apiModel.PlcResponseCode `stringer:"true"`
 	subscriptionHandle apiModel.PlcSubscriptionHandle
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionResponseItem_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionResponseItem_plc4xgen.go
index 80352f1..77be4a724 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionResponseItem_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionResponseItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionResponseItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionResponseItem"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionResponse_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionResponse_plc4xgen.go
index 6ef6b27..de29315 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionResponse_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionResponse_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionResponse"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionResponse"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionTag.go b/plc4go/spi/model/DefaultPlcSubscriptionTag.go
index f6c2b3e..7cab659 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionTag.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionTag.go
@@ -28,7 +28,7 @@
 
 var _ apiModel.PlcSubscriptionTag = &DefaultPlcSubscriptionTag{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionTag
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcSubscriptionTag
 type DefaultPlcSubscriptionTag struct {
 	plcTag              apiModel.PlcTag              `stringer:"true"`
 	plcSubscriptionType apiModel.PlcSubscriptionType `stringer:"true"`
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionTag_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionTag_plc4xgen.go
index a239823..09f801d 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionTag_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionTag_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionTag"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcSubscriptionTag"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcTagRequest.go b/plc4go/spi/model/DefaultPlcTagRequest.go
index da56bd6..adc0f9d 100644
--- a/plc4go/spi/model/DefaultPlcTagRequest.go
+++ b/plc4go/spi/model/DefaultPlcTagRequest.go
@@ -23,7 +23,7 @@
 	apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcTagRequest
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcTagRequest
 type DefaultPlcTagRequest struct {
 	tags     map[string]apiModel.PlcTag
 	tagNames []string `ignore:"true"`
diff --git a/plc4go/spi/model/DefaultPlcTagRequest_plc4xgen.go b/plc4go/spi/model/DefaultPlcTagRequest_plc4xgen.go
index bb4d6ff..289abea 100644
--- a/plc4go/spi/model/DefaultPlcTagRequest_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcTagRequest_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcTagRequest"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcTagRequest"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionRequest.go b/plc4go/spi/model/DefaultPlcUnsubscriptionRequest.go
index 6dcee84..0d64db8 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionRequest.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionRequest.go
@@ -30,7 +30,7 @@
 
 var _ apiModel.PlcUnsubscriptionRequestBuilder = &DefaultPlcUnsubscriptionRequestBuilder{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcUnsubscriptionRequestBuilder
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcUnsubscriptionRequestBuilder
 type DefaultPlcUnsubscriptionRequestBuilder struct {
 	subscriptionHandles []apiModel.PlcSubscriptionHandle
 }
@@ -50,7 +50,7 @@
 
 var _ apiModel.PlcUnsubscriptionRequest = &DefaultPlcUnsubscriptionRequest{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcUnsubscriptionRequest
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcUnsubscriptionRequest
 type DefaultPlcUnsubscriptionRequest struct {
 	subscriptionHandles []apiModel.PlcSubscriptionHandle
 }
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcUnsubscriptionRequestBuilder_plc4xgen.go
index 5a0ca33..985016f 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionRequestBuilder_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcUnsubscriptionRequestBuilder"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcUnsubscriptionRequestBuilder"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult.go b/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult.go
index 335a9c2..59b3af1 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.PlcUnsubscriptionRequestResult = &DefaultPlcUnsubscriptionRequestResult{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcUnsubscriptionRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcUnsubscriptionRequestResult
 type DefaultPlcUnsubscriptionRequestResult struct {
 	Request  apiModel.PlcUnsubscriptionRequest
 	Response apiModel.PlcUnsubscriptionResponse
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult_plc4xgen.go
index 4b1dd3c..992897c 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcUnsubscriptionRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcUnsubscriptionRequestResult"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionRequest_plc4xgen.go b/plc4go/spi/model/DefaultPlcUnsubscriptionRequest_plc4xgen.go
index 7dabfed..3ff6c14 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionRequest_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionRequest_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcUnsubscriptionRequest"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcUnsubscriptionRequest"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionResponse.go b/plc4go/spi/model/DefaultPlcUnsubscriptionResponse.go
index ef15346..ded53a4 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionResponse.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionResponse.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.PlcUnsubscriptionResponse = &DefaultPlcUnsubscriptionResponse{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcUnsubscriptionResponse
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcUnsubscriptionResponse
 type DefaultPlcUnsubscriptionResponse struct {
 	request apiModel.PlcUnsubscriptionRequest `ignore:"true"`
 	none    string
diff --git a/plc4go/spi/model/DefaultPlcUnsubscriptionResponse_plc4xgen.go b/plc4go/spi/model/DefaultPlcUnsubscriptionResponse_plc4xgen.go
index e2984a5..2c5e66b 100644
--- a/plc4go/spi/model/DefaultPlcUnsubscriptionResponse_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcUnsubscriptionResponse_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcUnsubscriptionResponse"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcUnsubscriptionResponse"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcWriteRequest.go b/plc4go/spi/model/DefaultPlcWriteRequest.go
index 4dbeaef..9c85568 100644
--- a/plc4go/spi/model/DefaultPlcWriteRequest.go
+++ b/plc4go/spi/model/DefaultPlcWriteRequest.go
@@ -34,7 +34,7 @@
 
 var _ apiModel.PlcWriteRequestBuilder = &DefaultPlcWriteRequestBuilder{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcWriteRequestBuilder
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcWriteRequestBuilder
 type DefaultPlcWriteRequestBuilder struct {
 	writer                  spi.PlcWriter       `ignore:"true"`
 	tagHandler              spi.PlcTagHandler   `ignore:"true"`
@@ -124,7 +124,7 @@
 
 var _ apiModel.PlcWriteRequest = &DefaultPlcWriteRequest{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcWriteRequest
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcWriteRequest
 type DefaultPlcWriteRequest struct {
 	*DefaultPlcTagRequest
 	values                  map[string]apiValues.PlcValue
diff --git a/plc4go/spi/model/DefaultPlcWriteRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcWriteRequestBuilder_plc4xgen.go
index 98b0606..4187c3c 100644
--- a/plc4go/spi/model/DefaultPlcWriteRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcWriteRequestBuilder_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcWriteRequestBuilder"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcWriteRequestBuilder"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcWriteRequestResult.go b/plc4go/spi/model/DefaultPlcWriteRequestResult.go
index 45e709a..40cef82 100644
--- a/plc4go/spi/model/DefaultPlcWriteRequestResult.go
+++ b/plc4go/spi/model/DefaultPlcWriteRequestResult.go
@@ -23,7 +23,7 @@
 
 var _ apiModel.PlcWriteRequestResult = &DefaultPlcWriteRequestResult{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcWriteRequestResult
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcWriteRequestResult
 type DefaultPlcWriteRequestResult struct {
 	Request  apiModel.PlcWriteRequest
 	Response apiModel.PlcWriteResponse
diff --git a/plc4go/spi/model/DefaultPlcWriteRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcWriteRequestResult_plc4xgen.go
index 43a7f4a..202ad8a 100644
--- a/plc4go/spi/model/DefaultPlcWriteRequestResult_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcWriteRequestResult_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcWriteRequestResult"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcWriteRequestResult"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcWriteRequest_plc4xgen.go b/plc4go/spi/model/DefaultPlcWriteRequest_plc4xgen.go
index 45afcb0..2b29e3e 100644
--- a/plc4go/spi/model/DefaultPlcWriteRequest_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcWriteRequest_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcWriteRequest"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcWriteRequest"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/DefaultPlcWriteResponse.go b/plc4go/spi/model/DefaultPlcWriteResponse.go
index 42c2ecb..bd3a543 100644
--- a/plc4go/spi/model/DefaultPlcWriteResponse.go
+++ b/plc4go/spi/model/DefaultPlcWriteResponse.go
@@ -25,7 +25,7 @@
 
 var _ apiModel.PlcWriteResponse = &DefaultPlcWriteResponse{}
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcWriteResponse
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=DefaultPlcWriteResponse
 type DefaultPlcWriteResponse struct {
 	request       apiModel.PlcWriteRequest
 	responseCodes map[string]apiModel.PlcResponseCode
diff --git a/plc4go/spi/model/DefaultPlcWriteResponse_plc4xgen.go b/plc4go/spi/model/DefaultPlcWriteResponse_plc4xgen.go
index f12fb05..d173fb9 100644
--- a/plc4go/spi/model/DefaultPlcWriteResponse_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcWriteResponse_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=DefaultPlcWriteResponse"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=DefaultPlcWriteResponse"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/model/ResponseItem.go b/plc4go/spi/model/ResponseItem.go
index c4e85de..d201c42 100644
--- a/plc4go/spi/model/ResponseItem.go
+++ b/plc4go/spi/model/ResponseItem.go
@@ -24,7 +24,7 @@
 	"github.com/apache/plc4x/plc4go/pkg/api/values"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=ResponseItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=ResponseItem
 type ResponseItem struct {
 	code  apiModel.PlcResponseCode `stringer:"true"`
 	value values.PlcValue
diff --git a/plc4go/spi/model/ResponseItem_plc4xgen.go b/plc4go/spi/model/ResponseItem_plc4xgen.go
index 3badc85..e0e0102 100644
--- a/plc4go/spi/model/ResponseItem_plc4xgen.go
+++ b/plc4go/spi/model/ResponseItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=ResponseItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=ResponseItem"; DO NOT EDIT.
 
 package model
 
diff --git a/plc4go/spi/pool/dynamicExecutor.go b/plc4go/spi/pool/dynamicExecutor.go
index 95bf21d..384075d 100644
--- a/plc4go/spi/pool/dynamicExecutor.go
+++ b/plc4go/spi/pool/dynamicExecutor.go
@@ -34,7 +34,7 @@
 var downScaleInterval = 5 * time.Second
 var timeToBecomeUnused = 5 * time.Second
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=dynamicExecutor
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=dynamicExecutor
 type dynamicExecutor struct {
 	*executor
 
diff --git a/plc4go/spi/pool/dynamicExecutor_plc4xgen.go b/plc4go/spi/pool/dynamicExecutor_plc4xgen.go
index 5d051eb..d6f8dff 100644
--- a/plc4go/spi/pool/dynamicExecutor_plc4xgen.go
+++ b/plc4go/spi/pool/dynamicExecutor_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=dynamicExecutor"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=dynamicExecutor"; DO NOT EDIT.
 
 package pool
 
diff --git a/plc4go/spi/pool/executor.go b/plc4go/spi/pool/executor.go
index 68791f7..14699e9 100644
--- a/plc4go/spi/pool/executor.go
+++ b/plc4go/spi/pool/executor.go
@@ -28,7 +28,7 @@
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=executor
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=executor
 type executor struct {
 	running  bool
 	shutdown bool
diff --git a/plc4go/spi/pool/executor_plc4xgen.go b/plc4go/spi/pool/executor_plc4xgen.go
index 6a4d94c..7d45d82 100644
--- a/plc4go/spi/pool/executor_plc4xgen.go
+++ b/plc4go/spi/pool/executor_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=executor"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=executor"; DO NOT EDIT.
 
 package pool
 
diff --git a/plc4go/spi/pool/future.go b/plc4go/spi/pool/future.go
index 41d4396..8d7e1f2 100644
--- a/plc4go/spi/pool/future.go
+++ b/plc4go/spi/pool/future.go
@@ -27,7 +27,7 @@
 	"github.com/pkg/errors"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=future
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=future
 type future struct {
 	cancelRequested    atomic.Bool
 	interruptRequested atomic.Bool
diff --git a/plc4go/spi/pool/future_plc4xgen.go b/plc4go/spi/pool/future_plc4xgen.go
index e449d62..d3298dc 100644
--- a/plc4go/spi/pool/future_plc4xgen.go
+++ b/plc4go/spi/pool/future_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=future"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=future"; DO NOT EDIT.
 
 package pool
 
diff --git a/plc4go/spi/pool/workItem.go b/plc4go/spi/pool/workItem.go
index 4373551..8772f08 100644
--- a/plc4go/spi/pool/workItem.go
+++ b/plc4go/spi/pool/workItem.go
@@ -19,7 +19,7 @@
 
 package pool
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=workItem
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=workItem
 type workItem struct {
 	workItemId       int32
 	runnable         Runnable `ignore:"true"`
diff --git a/plc4go/spi/pool/workItem_plc4xgen.go b/plc4go/spi/pool/workItem_plc4xgen.go
index 71760b4..a1c5806 100644
--- a/plc4go/spi/pool/workItem_plc4xgen.go
+++ b/plc4go/spi/pool/workItem_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=workItem"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=workItem"; DO NOT EDIT.
 
 package pool
 
diff --git a/plc4go/spi/pool/worker.go b/plc4go/spi/pool/worker.go
index e9498b0..11dd0ad 100644
--- a/plc4go/spi/pool/worker.go
+++ b/plc4go/spi/pool/worker.go
@@ -28,7 +28,7 @@
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=worker
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=worker
 type worker struct {
 	id       int
 	executor interface {
diff --git a/plc4go/spi/pool/worker_plc4xgen.go b/plc4go/spi/pool/worker_plc4xgen.go
index 638a631..1d64bbd 100644
--- a/plc4go/spi/pool/worker_plc4xgen.go
+++ b/plc4go/spi/pool/worker_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=worker"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=worker"; DO NOT EDIT.
 
 package pool
 
diff --git a/plc4go/spi/testutils/DriverTestRunner.go b/plc4go/spi/testutils/DriverTestRunner.go
index 57d265f..cf79c85 100644
--- a/plc4go/spi/testutils/DriverTestRunner.go
+++ b/plc4go/spi/testutils/DriverTestRunner.go
@@ -498,7 +498,7 @@
 type StepType uint8
 
 //go:generate stringer -type StepType
-//go:generate go run ../../tools/plc4xlicenser/gen.go -type=StepType
+//go:generate go run ../../tools/plc4xLicenser/main.go -type=StepType
 const (
 	StepTypeOutgoingPlcMessage StepType = 0x01
 	StepTypeOutgoingPlcBytes   StepType = 0x02
diff --git a/plc4go/spi/transactions/RequestTransaction.go b/plc4go/spi/transactions/RequestTransaction.go
index 9791634..24032a1 100644
--- a/plc4go/spi/transactions/RequestTransaction.go
+++ b/plc4go/spi/transactions/RequestTransaction.go
@@ -54,7 +54,7 @@
 // Internal section
 //
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=requestTransaction
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=requestTransaction
 type requestTransaction struct {
 	parent        *requestTransactionManager `ignore:"true"`
 	transactionId int32
diff --git a/plc4go/spi/transactions/RequestTransactionManager.go b/plc4go/spi/transactions/RequestTransactionManager.go
index d4c7a75..4950363 100644
--- a/plc4go/spi/transactions/RequestTransactionManager.go
+++ b/plc4go/spi/transactions/RequestTransactionManager.go
@@ -111,7 +111,7 @@
 	executor pool.Executor
 }
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=requestTransactionManager
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=requestTransactionManager
 type requestTransactionManager struct {
 	runningRequests     []*requestTransaction
 	runningRequestMutex sync.RWMutex
diff --git a/plc4go/spi/transactions/completedFuture.go b/plc4go/spi/transactions/completedFuture.go
index 08708ba..f87886c 100644
--- a/plc4go/spi/transactions/completedFuture.go
+++ b/plc4go/spi/transactions/completedFuture.go
@@ -23,7 +23,7 @@
 	"context"
 )
 
-//go:generate go run ../../tools/plc4xgenerator/gen.go -type=completedFuture
+//go:generate go run ../../tools/plc4xGenerator/main.go -type=completedFuture
 type completedFuture struct {
 	err error
 }
diff --git a/plc4go/spi/transactions/completedFuture_plc4xgen.go b/plc4go/spi/transactions/completedFuture_plc4xgen.go
index 6e289d1..97aa0f5 100644
--- a/plc4go/spi/transactions/completedFuture_plc4xgen.go
+++ b/plc4go/spi/transactions/completedFuture_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=completedFuture"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=completedFuture"; DO NOT EDIT.
 
 package transactions
 
diff --git a/plc4go/spi/transactions/requestTransactionManager_plc4xgen.go b/plc4go/spi/transactions/requestTransactionManager_plc4xgen.go
index b11af29..36cbc81 100644
--- a/plc4go/spi/transactions/requestTransactionManager_plc4xgen.go
+++ b/plc4go/spi/transactions/requestTransactionManager_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=requestTransactionManager"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=requestTransactionManager"; DO NOT EDIT.
 
 package transactions
 
diff --git a/plc4go/spi/transactions/requestTransaction_plc4xgen.go b/plc4go/spi/transactions/requestTransaction_plc4xgen.go
index d6296b4..8d9a31a 100644
--- a/plc4go/spi/transactions/requestTransaction_plc4xgen.go
+++ b/plc4go/spi/transactions/requestTransaction_plc4xgen.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-// Code generated by "plc4xgenerator -type=requestTransaction"; DO NOT EDIT.
+// Code generated by "plc4xGenerator -type=requestTransaction"; DO NOT EDIT.
 
 package transactions
 
diff --git a/plc4go/tools/plc4xgenerator/gen.go b/plc4go/tools/plc4xGenerator/main.go
similarity index 98%
rename from plc4go/tools/plc4xgenerator/gen.go
rename to plc4go/tools/plc4xGenerator/main.go
index e37af76..79083a1 100644
--- a/plc4go/tools/plc4xgenerator/gen.go
+++ b/plc4go/tools/plc4xGenerator/main.go
@@ -44,16 +44,16 @@
 
 // Usage is a replacement usage function for the flags package.
 func Usage() {
-	_, _ = fmt.Fprintf(os.Stderr, "Usage of plc4xgenerator:\n")
-	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xgenerator [flags] -type T [directory]\n")
-	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xgenerator [flags] -type T files... # Must be a single package\n")
+	_, _ = fmt.Fprintf(os.Stderr, "Usage of plc4xGenerator:\n")
+	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xGenerator [flags] -type T [directory]\n")
+	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xGenerator [flags] -type T files... # Must be a single package\n")
 	_, _ = fmt.Fprintf(os.Stderr, "Flags:\n")
 	flag.PrintDefaults()
 }
 
 func main() {
 	log.SetFlags(0)
-	log.SetPrefix("plc4xgenerator: ")
+	log.SetPrefix("plc4xGenerator: ")
 	flag.Usage = Usage
 	flag.Parse()
 	if len(*typeNames) == 0 {
@@ -87,7 +87,7 @@
 
 	// Print the header and package clause.
 	generator.Printf(asfHeader)
-	generator.Printf("// Code generated by \"plc4xgenerator %s\"; DO NOT EDIT.\n", strings.Join(os.Args[1:], " "))
+	generator.Printf("// Code generated by \"plc4xGenerator %s\"; DO NOT EDIT.\n", strings.Join(os.Args[1:], " "))
 	generator.Printf("\n")
 	generator.Printf("package %s", generator.pkg.name)
 	generator.Printf("\n")
diff --git a/plc4go/tools/plc4xlicenser/gen.go b/plc4go/tools/plc4xLicenser/main.go
similarity index 94%
rename from plc4go/tools/plc4xlicenser/gen.go
rename to plc4go/tools/plc4xLicenser/main.go
index e5ff6f3..1273cc7 100644
--- a/plc4go/tools/plc4xlicenser/gen.go
+++ b/plc4go/tools/plc4xLicenser/main.go
@@ -41,9 +41,9 @@
 
 // Usage is a replacement usage function for the flags package.
 func Usage() {
-	_, _ = fmt.Fprintf(os.Stderr, "Usage of plc4xlicenser:\n")
-	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xlicenser [flags] -type T [directory]\n")
-	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xlicenser [flags] -type T files... # Must be a single package\n")
+	_, _ = fmt.Fprintf(os.Stderr, "Usage of plc4xLicenser:\n")
+	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xLicenser [flags] -type T [directory]\n")
+	_, _ = fmt.Fprintf(os.Stderr, "\tplc4xLicenser [flags] -type T files... # Must be a single package\n")
 	_, _ = fmt.Fprintf(os.Stderr, "Flags:\n")
 	flag.PrintDefaults()
 }