Changed some of the naming to match .NET conventions.