Update class naming for PSR-0