Renames some components to make it more readable