Minor renaming fixes
Branch merge