diff --git a/cmd/onvif-server/main.go b/cmd/onvif-server/main.go
index 49f0ba2..442da7a 100644
--- a/cmd/onvif-server/main.go
+++ b/cmd/onvif-server/main.go
@@ -23,7 +23,7 @@ func main() {
 	port := flag.Int("port", 8080, "Server port")
 	username := flag.String("username", "admin", "Authentication username")
 	password := flag.String("password", "admin", "Authentication password")
-	manufacturer := flag.String("manufacturer", "go-onvif", "Device manufacturer")
+	manufacturer := flag.String("manufacturer", "onvif-go", "Device manufacturer")
 	model := flag.String("model", "Virtual Multi-Lens Camera", "Device model")
 	firmware := flag.String("firmware", "1.0.0", "Firmware version")
 	serial := flag.String("serial", "SN-12345678", "Serial number")
diff --git a/examples/complete-demo/main.go b/examples/complete-demo/main.go
index 6741c5f..5fbbac0 100644
--- a/examples/complete-demo/main.go
+++ b/examples/complete-demo/main.go
@@ -10,7 +10,7 @@ import (
 	"github.com/0x524a/onvif-go/discovery"
 )
 
-// This is a comprehensive demonstration of all go-onvif features
+// This is a comprehensive demonstration of all onvif-go features
 func main() {
 	// Step 1: Discover cameras on the network
 	fmt.Println("=== Step 1: Discovering ONVIF Cameras ===")
diff --git a/examples/manual-soap-test/main.go b/examples/manual-soap-test/main.go
index c157f09..66c0713 100644
--- a/examples/manual-soap-test/main.go
+++ b/examples/manual-soap-test/main.go
@@ -73,7 +73,7 @@ func main() {
 
 		if resp.StatusCode == 401 {
 			fmt.Println("💡 Authentication required - this is expected!")
-			fmt.Println("💡 Now testing with go-onvif client library...")
+			fmt.Println("💡 Now testing with onvif-go client library...")
 			fmt.Println()
 			testWithClient(username, password)
 		} else {
@@ -91,7 +91,7 @@ func testWithClient(username, password string) {
 	onvif := struct{}{}
 	_ = onvif
 
-	fmt.Println("Note: Would test with go-onvif client here, but keeping this simple.")
+	fmt.Println("Note: Would test with onvif-go client here, but keeping this simple.")
 	fmt.Println("The camera appears to be responding to ONVIF requests.")
 	fmt.Println()
 	fmt.Println("💡 Next step: Check if the credentials are correct")
diff --git a/server/README.md b/server/README.md
index bd1de42..d1c9ade 100644
--- a/server/README.md
+++ b/server/README.md
@@ -95,7 +95,7 @@ The server will start on `http://0.0.0.0:8080` with:
   -password string
         Authentication password (default "admin")
   -manufacturer string
-        Device manufacturer (default "go-onvif")
+        Device manufacturer (default "onvif-go")
   -model string
         Device model (default "Virtual Multi-Lens Camera")
   -firmware string
diff --git a/server/types.go b/server/types.go
index 908968b..badb83a 100644
--- a/server/types.go
+++ b/server/types.go
@@ -235,7 +235,7 @@ func DefaultConfig() *Config {
 		BasePath: "/onvif",
 		Timeout:  30 * time.Second,
 		DeviceInfo: DeviceInfo{
-			Manufacturer:    "go-onvif",
+			Manufacturer:    "onvif-go",
 			Model:           "Virtual Multi-Lens Camera",
 			FirmwareVersion: "1.0.0",
 			SerialNumber:    "SN-12345678",