some renamings
some cleanup