Rename class to match component name
Remove legacy code which has to be rewritten