more class rename, small changes