Renamings and tweaking