Rename methods per PSR-2 standard and update some comments