diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs
index 9144138095..b7c635c055 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs
@@ -57,6 +57,8 @@ namespace CSharpBinding.FormsDesigner
 		string GetComponentName(IComponent component)
 		{
 			string siteName = component.Site.Name;
+			if (GeneralOptionsPanel.GenerateVisualStudioStyleEventHandlers)
+				return siteName;
 			return Char.ToUpper(siteName[0]) + siteName.Substring(1);
 		}