refactor class names take two.