Fix to Util class for PSR-0 class naming.