Fix inconsistant naming