Renaming & minor modification