bug936916 - Change keyname