Change mapping for moved match-pattern