Fixed names to more closely follow C# naming convention.