Rename some things
Bring NatAsNumber.mc up to date with newest syntax.