Changes reflecting refactoring of related projects