Refractor classes to new naming format