Fixed missed renames from previous CL daemon.cc has these renamed, but not daemon.h. Not sure how this compiled locally. Change-Id: Ia7efed2764dc1d8580cfa9f16518459ec3732be6