added amir and edit on name capitalization