Adapt to Project.NameKey refactoring

Change-Id: Id7ce49591f0d386d96e69912624f76f9ca37d956
4 files changed