renamed components to be r-*