[misc] Updated component names after refactoring classes