Renamed to follow naming convention