GUI-463 case consistency for key pairs