Rename, update class