Minor renamings