diff --git a/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Handler.cs b/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Handler.cs
index 44a36d3..4864d52 100644
--- a/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Handler.cs
+++ b/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Handler.cs
@@ -16,8 +16,9 @@ public partial class DBusSourceGenerator
     {
         private ClassDeclarationSyntax GenerateHandler(DBusInterface dBusInterface)
         {
-            ClassDeclarationSyntax cl = ClassDeclaration(
-                    Pascalize(dBusInterface.Name!))
+            string identifier = $"{Pascalize(dBusInterface.Name!)}Handler";
+
+            ClassDeclarationSyntax cl = ClassDeclaration(identifier)
                 .AddModifiers(
                     Token(SyntaxKind.InternalKeyword),
                     Token(SyntaxKind.AbstractKeyword))
@@ -29,8 +30,7 @@ private ClassDeclarationSyntax GenerateHandler(DBusInterface dBusInterface)
                         "_synchronizationContext",
                         NullableType(
                             IdentifierName("SynchronizationContext"))),
-                    ConstructorDeclaration(
-                            Pascalize(dBusInterface.Name!))
+                    ConstructorDeclaration(identifier)
                         .AddModifiers(
                             Token(SyntaxKind.PublicKeyword))
                         .AddParameterListParameters(
diff --git a/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Proxy.cs b/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Proxy.cs
index a0235c0..cf0f848 100644
--- a/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Proxy.cs
+++ b/Tmds.DBus.SourceGenerator/DBusSourceGenerator.Proxy.cs
@@ -12,7 +12,7 @@ public partial class DBusSourceGenerator
     {
         private ClassDeclarationSyntax GenerateProxy(DBusInterface dBusInterface)
         {
-            string identifier = Pascalize(dBusInterface.Name!);
+            string identifier = Pascalize($"{dBusInterface.Name!}Proxy");
             ClassDeclarationSyntax cl = ClassDeclaration(identifier)
                 .AddModifiers(Token(SyntaxKind.InternalKeyword));
 
diff --git a/Tmds.DBus.SourceGenerator/DBusSourceGenerator.cs b/Tmds.DBus.SourceGenerator/DBusSourceGenerator.cs
index aa47701..4ea8b91 100644
--- a/Tmds.DBus.SourceGenerator/DBusSourceGenerator.cs
+++ b/Tmds.DBus.SourceGenerator/DBusSourceGenerator.cs
@@ -63,7 +63,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                                     IdentifierName("Tmds.DBus.SourceGenerator"))
                                     .AddMembers(typeDeclarationSyntax);
                                 CompilationUnitSyntax compilationUnit = MakeCompilationUnit(namespaceDeclaration);
-                                productionContext.AddSource($"Tmds.DBus.SourceGenerator.{Pascalize(dBusInterface.Name!)}.g.cs", compilationUnit.GetText(Encoding.UTF8));
+                                productionContext.AddSource($"Tmds.DBus.SourceGenerator.{Pascalize(dBusInterface.Name!)}Proxy.g.cs", compilationUnit.GetText(Encoding.UTF8));
                             }
                             break;
                         case "Handler":
@@ -74,7 +74,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                                         IdentifierName("Tmds.DBus.SourceGenerator"))
                                     .AddMembers(typeDeclarationSyntax);
                                 CompilationUnitSyntax compilationUnit = MakeCompilationUnit(namespaceDeclaration);
-                                productionContext.AddSource($"Tmds.DBus.SourceGenerator.{Pascalize(dBusInterface.Name!)}.g.cs", compilationUnit.GetText(Encoding.UTF8));
+                                productionContext.AddSource($"Tmds.DBus.SourceGenerator.{Pascalize(dBusInterface.Name!)}Handler.g.cs", compilationUnit.GetText(Encoding.UTF8));
                             }
                             break;
                     }