Adapt to Project.NameKey refactoring

Change-Id: Ic8d9bb19e9dc5d2d405783acd300734edf5b39ca
4 files changed