watch flag integration + IOT naming convention integration