Rename variables.

i think these are better.  shorter for sure.

there's plenty to make better in this. but i think it will have
to wait until tomorrow at least.  even luigi must have gone to
bed cause he hasn't popped up in a while...