class rename & rework