Renames component selectors to be less complicated