Refactored Device Controllers to use correct Verbs