Litte bit of renaming for props and their components.