Rename classes to be complient with PSR-0