Rename components to use a better convention