Changed expression constructor functions to have more canon names