Refactor the names of components