Rename to Expression, bring back Registry