Map all old_short_name relations in Provision directly (fixed).