Change hash keys to backward compatible format