Renamed now follows the structure I want