renaming the 2 class specific watch services since they arent OS specific