Renamed more around the interfaces/render