Undone some bad renaming.