Moved key name function to Keys

Also added extra key names.