master: (1) a few renames in attributes names; (2) sync the rotation matrix