Rename some local variables in command.c