Updated naming to C# naming convention