Merge pull request #1696 from gennadiycivil/master

Code transforms changes, renames.