Renamed all classes to match ZF standards