renamed some things

cont