Fixed inconsistant naming