Change token- and state-name convention to camelCase