component name refactor