Rename some variables in Cifi