Merge "Fix readx/writex names."