Renaming of identifiers to avoid confusion