rename some stuff, and add some esprima inspired helpers