Issue 004 tom key rename