Rename things according to paper.