Some renaming to more canonical names.