ToDo edit

renamed some stuff