Change to C# naming convention