Some more renamings.