Renaming and comments
p4#: 22333