Changes to the names and syntax