qualify the interface name in a few more places

Change-Id: I88650bc03b2e6b1195c936d1b15e255214258648