mathlib

321458b3 - change names and switch order of rewriting