More Naemon/Nagios naming changes