Renamed class and namespace (PSR-0 compliant)