Renamings and polish.