Changed naming to follow PSR-2