A couple of related fixes and renames too. Updates #981 Fixes #1056 Change-Id: Id47a933c77422edfb9db41d34c38ed9d0d7a1846