Rename methods to PSR-1 style