fix naming for keys