rename function and classes to follow PSR-1