Rename, typo correction & slight tweak