Merge "Move and rename some members (1/n)"