efractor classes to new naming format