matrix: use v2 sync API. Fix a few naming issues.
matrix: use v2 sync API. Fix a few naming issues.

Former-commit-id: e4af8bed250a5e090141b757d42c85b308aa077f
Former-commit-id: 399244cc5e94e51e4760d9b9353e9531c897ad5d
torhve/ivar2,torhve/ivar2,torhve/ivar2,haste/ivar2