Changing method names to PSR-1