Move corrected ministry names to variants segment, add boilerplate segments, revert keys