Renamed all identifiers to new naming conventions.