diff --git a/drivers/ciena/waveserver/BUILD b/drivers/ciena/waveserver/BUILD
index 64cd99f..7a890f2 100644
--- a/drivers/ciena/waveserver/BUILD
+++ b/drivers/ciena/waveserver/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@javax_ws_rs_api//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//drivers/utilities:onos-drivers-utilities",
     "//protocols/rest/api:onos-protocols-rest-api",
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java
index ea02de3..0abffe5 100644
--- a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaRestDevice.java
@@ -24,10 +24,10 @@
 import org.onlab.util.Frequency;
 import org.onlab.util.Spectrum;
 import org.onosproject.driver.optical.flowrule.CrossConnectCache;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmEntityId;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.ChannelSpacing;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.OchSignal;
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java
index c1a6767..23a80b0 100644
--- a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaWaveServerAlarmConsumer.java
@@ -16,8 +16,8 @@
 
 package org.onosproject.drivers.ciena.waveserver.rest;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmConsumer;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.slf4j.Logger;
 
diff --git a/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml b/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml
index 1a779b1..3e46667 100644
--- a/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml
+++ b/drivers/ciena/waveserver/src/main/resources/ciena-drivers.xml
@@ -27,7 +27,7 @@
                    impl="org.onosproject.drivers.ciena.waveserver.rest.CienaFlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.drivers.ciena.waveserver.rest.CienaWaveServerLambdaQuery"/>
-        <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
+        <behaviour api="org.onosproject.alarm.AlarmConsumer"
                    impl="org.onosproject.drivers.ciena.waveserver.rest.CienaWaveServerAlarmConsumer"/>
     </driver>
 </drivers>