CTF editor cleanup

rename a bunch of stuff