Refactor some code to follow the new name of component (Part 2)