fixed some typo and update naming