Brings PHP closer in line with likely final method naming. Some tweaking still necessary maybe.