unified names for expressions
Merge branch 'master' of https://github.com/nickma82/ws13_algo_msp