some final renamings