Renamed some functions to match the rest

Fixed a couple more php warnings