fix discipline naming, other