Replace Int64 with Int and Uint64 with Uint