update naming for keys