class name renaming finished.

had to pull the binding code and just control it manually, that will be
an issue for sorting later on.