Rename EffM to Eff and switch to {} syntax