diff --git a/collections/fm.alarmclasses/Environment/UPS/Input_Voltage_or_Frequency_Problem.json b/collections/fm.alarmclasses/Environment/UPS/Input_Voltage_or_Frequency_Problem.json
new file mode 100644
index 0000000000000000000000000000000000000000..0a7a1cef9f8f632dfca37579dd73151ee2d6cc77
--- /dev/null
+++ b/collections/fm.alarmclasses/Environment/UPS/Input_Voltage_or_Frequency_Problem.json
@@ -0,0 +1,16 @@
+{
+    "name": "Environment | UPS | Input Voltage or Frequency Problem",
+    "$collection": "fm.alarmclasses",
+    "uuid": "051cbdbe-a209-4314-bb30-6c432c5a6da9",
+    "is_unique": true,
+    "user_clearable": true,
+    "default_severity__name": "MAJOR",
+    "vars": [
+
+    ],
+    "subject_template": "Input Voltage or Frequency Problem",
+    "body_template": "Input Voltage or Frequency Problem",
+    "symptoms": "",
+    "probable_causes": "",
+    "recommended_actions": ""
+}
diff --git a/collections/fm.eventclasses/Environment/UPS/Input_Power_OK.json b/collections/fm.eventclasses/Environment/UPS/Input_Power_OK.json
index aa8f7285deb34bca5fa77368110449bf6deb6db6..1ec92f41ca203eb6158339cf14a5ef6c692a1172 100644
--- a/collections/fm.eventclasses/Environment/UPS/Input_Power_OK.json
+++ b/collections/fm.eventclasses/Environment/UPS/Input_Power_OK.json
@@ -24,6 +24,12 @@
             "condition": "True",
             "action": "clear",
             "alarm_class__name": "Environment | UPS | Input Power Low"
+        },
+        {
+            "name": "dispose",
+            "condition": "True",
+            "action": "clear",
+            "alarm_class__name": "Environment | UPS | Input Voltage or Frequency Problem"
         }
     ]
 }
diff --git a/collections/fm.eventclasses/Environment/UPS/Input_Voltage_or_Frequency_Problem.json b/collections/fm.eventclasses/Environment/UPS/Input_Voltage_or_Frequency_Problem.json
new file mode 100644
index 0000000000000000000000000000000000000000..412cb1540933a4dbf7971088afb34036efc54a89
--- /dev/null
+++ b/collections/fm.eventclasses/Environment/UPS/Input_Voltage_or_Frequency_Problem.json
@@ -0,0 +1,23 @@
+{
+    "name": "Environment | UPS | Input Voltage or Frequency Problem",
+    "$collection": "fm.eventclasses",
+    "uuid": "1e855ed2-ce1f-44c1-aae2-af629c3d98c1",
+    "description": "Input Voltage or Frequency Problem",
+    "action": "A",
+    "vars": [
+
+    ],
+    "subject_template": "Input Voltage or Frequency Problem",
+    "body_template": "Input Voltage or Frequency Problem",
+    "symptoms": "",
+    "probable_causes": "",
+    "recommended_actions": "",
+    "disposition": [
+        {
+            "name": "dispose",
+            "condition": "True",
+            "action": "raise",
+            "alarm_class__name": "Environment | UPS | Input Voltage or Frequency Problem"
+        }
+    ]
+}
diff --git a/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Power_Failed_3_SYSLOG_.json b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_1_SYSLOG_.json
similarity index 70%
rename from collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Power_Failed_3_SYSLOG_.json
rename to collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_1_SYSLOG_.json
index 56e8867de6e96b93f27c3296b3be447cc7dfbe57..08c7af1995ff76fbfbcd46ae79e9aacd3eed023e 100644
--- a/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Power_Failed_3_SYSLOG_.json
+++ b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_1_SYSLOG_.json
@@ -1,9 +1,9 @@
 {
-    "name": "APC | AOS | Environment | UPS | Input Power Failed #3 (SYSLOG)",
+    "name": "APC | AOS | Environment | UPS | Input Voltage or Frequency Problem #1 (SYSLOG)",
     "$collection": "fm.eventclassificationrules",
-    "uuid": "aba16c3d-ddbc-41d4-ab91-c6b165fee1e0",
+    "uuid": "3535c565-3ca0-41d5-9eb1-01ceada0ce7b",
     "description": "UPS: An input voltage or frequency problem prevents switching to bypass mode. 0x020F",
-    "event_class__name": "Environment | UPS | Input Power Failed",
+    "event_class__name": "Environment | UPS | Input Voltage or Frequency Problem",
     "preference": 1000,
     "patterns": [
         {
diff --git a/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_2_SYSLOG_.json b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_2_SYSLOG_.json
new file mode 100644
index 0000000000000000000000000000000000000000..84645376abfb3018cfdd7b3e20ce0c651e15d1b1
--- /dev/null
+++ b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_2_SYSLOG_.json
@@ -0,0 +1,22 @@
+{
+    "name": "APC | AOS | Environment | UPS | Input Voltage or Frequency Problem #2 (SYSLOG)",
+    "$collection": "fm.eventclassificationrules",
+    "uuid": "70e692a9-1668-413f-8c6b-8ec42af9b4ad",
+    "description": "UPS: Bypass not in range ; distorted waveform. 0x020F",
+    "event_class__name": "Environment | UPS | Input Voltage or Frequency Problem",
+    "preference": 1000,
+    "patterns": [
+        {
+            "key_re": "^profile$",
+            "value_re": "^APC\\.AOS$"
+        },
+        {
+            "key_re": "^source$",
+            "value_re": "^syslog$"
+        },
+        {
+            "key_re": "^message$",
+            "value_re": "UPS: Bypass not in range ; (?:distorted waveform|either frequency or voltage|low voltage). 0x020F"
+        }
+    ]
+}
diff --git a/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_3_SYSLOG_.json b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_3_SYSLOG_.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b67ca48caf7d7ff54df44f6bb24b18d671debd4
--- /dev/null
+++ b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Input_Voltage_or_Frequency_Problem_3_SYSLOG_.json
@@ -0,0 +1,22 @@
+{
+    "name": "APC | AOS | Environment | UPS | Input Voltage or Frequency Problem #3 (SYSLOG)",
+    "$collection": "fm.eventclassificationrules",
+    "uuid": "b8677cad-98bc-49f2-80eb-2fb566fa3d6e",
+    "description": "UPS: On battery power in response to distorted input. 0x0109",
+    "event_class__name": "Environment | UPS | Input Voltage or Frequency Problem",
+    "preference": 1000,
+    "patterns": [
+        {
+            "key_re": "^profile$",
+            "value_re": "^APC\\.AOS$"
+        },
+        {
+            "key_re": "^source$",
+            "value_re": "^syslog$"
+        },
+        {
+            "key_re": "^message$",
+            "value_re": "UPS: On battery power in response to distorted input. 0x0109"
+        }
+    ]
+}
diff --git a/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Self-Test_Started_2_SYSLOG_.json b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Self-Test_Started_2_SYSLOG_.json
new file mode 100644
index 0000000000000000000000000000000000000000..263191dc54102f7d0e7ea176b7aaa716066cfded
--- /dev/null
+++ b/collections/fm.eventclassificationrules/APC/AOS/Environment/UPS/Self-Test_Started_2_SYSLOG_.json
@@ -0,0 +1,22 @@
+{
+    "name": "APC | AOS | Environment | UPS | Self-Test Started #2 (SYSLOG)",
+    "$collection": "fm.eventclassificationrules",
+    "uuid": "2647e638-d137-4afe-a63f-a171169e1369",
+    "description": "UPS: Self-Test started by automatic timer. 0x0137",
+    "event_class__name": "Environment | UPS | Self-Test Started",
+    "preference": 1000,
+    "patterns": [
+        {
+            "key_re": "^source$",
+            "value_re": "^syslog$"
+        },
+        {
+            "key_re": "^profile$",
+            "value_re": "^APC\\.AOS$"
+        },
+        {
+            "key_re": "^message$",
+            "value_re": "UPS: Self-Test started by automatic timer. 0x0137"
+        }
+    ]
+}
\ No newline at end of file