Had to rename classes to handle PSR-0