PSR-0-ize the fields