Daryl's latest renaming commit needed some fixes

Couple tiny fixes...

Change-Id: I46277a794de5cd076c76ee35218f30d79fc10807
2 files changed