renaming components to help to understand the hierarchy