Missed naming conversion
Resolve alarm issues
Move notification_plan_id to update actions
Resolve alarm DSL errors