Renamed some methods and fields to match existing coding-style