Fixes #r's 'name'

We can call it anything, so long as we call it the same thing that we
look for later.  Sticking with letters for now, even though #/ is
somewhat legit.
Changes %C -> %c in format strings

We don't have %C.