cleanups and renames, this will break you config!