CTF editor cleanup

rename a bunch of stuff
Yeah... Rushing is bad. Fixed.