update naming changes on code