fix, rename, struct Arrow