Small fixes to the rename command.

Renamed factoidkey2 to newfactoidkey and fixed its declaration.
Added an alpha match on newfactoidkey.