Rename several classes to match PSR-2 naming.