change hash keys
ugly