refactor class names for consistency
refactor class names for consistency