[#1490] Cleanup fo PSR(1/2) method naming.