Started to tidy up some of the naming so they are more C# like