Unify terminology in o.o.sales somewhat, which also makes it easier to support midgard-portable