Make names match actual midgard behaviour