Fix ftests (restriction->constraint)
Renaming strategies + notes