Change some names and remove syntax rules now that Monad noise is gone