A few renamings to be consistent.