Dependency clean up for compilation (again).

Lots of renaming. See docs/CHANGES.md for more details.
Merge remote-tracking branch 'origin/master'
Merging renaming commit.