Updated class names after refactor