Renamed some classes, PermGen test.