diff --git a/rw_core/core/adapter_proxy.go b/rw_core/core/adapter_proxy.go
index c8b28aa..fac9b6d 100755
--- a/rw_core/core/adapter_proxy.go
+++ b/rw_core/core/adapter_proxy.go
@@ -532,15 +532,13 @@
 	return nil
 }
 
-// SuppressAlarm - TODO
-func (ap *AdapterProxy) SuppressAlarm(filter voltha.AlarmFilter) error {
-	log.Debug("SuppressAlarm")
+func (ap *AdapterProxy) SuppressEvent(filter *voltha.EventFilter) error {
+	log.Debug("SuppressEvent")
 	return nil
 }
 
-// UnSuppressAlarm - TODO
-func (ap *AdapterProxy) UnSuppressAlarm(filter voltha.AlarmFilter) error {
-	log.Debug("UnSuppressAlarm")
+func (ap *AdapterProxy) UnSuppressEvent(filter *voltha.EventFilter) error {
+	log.Debug("UnSuppressEvent")
 	return nil
 }
 
diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 7bbf5ee..36cb647 100755
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -905,48 +905,33 @@
 	return handler.deviceMgr.listPmConfigs(ctx, id.Id)
 }
 
-// CreateAlarmFilter creates alarm filter
-func (handler *APIHandler) CreateAlarmFilter(ctx context.Context, filter *voltha.AlarmFilter) (*voltha.AlarmFilter, error) {
-	log.Debugw("CreateAlarmFilter-request", log.Fields{"filter": *filter})
-	if isTestMode(ctx) {
-		f := &voltha.AlarmFilter{Id: filter.Id}
-		return f, nil
-	}
-	return &voltha.AlarmFilter{}, errors.New("UnImplemented")
+func (handler *APIHandler) CreateEventFilter(ctx context.Context, filter *voltha.EventFilter) (*voltha.EventFilter, error) {
+	log.Debugw("CreateEventFilter-request", log.Fields{"filter": *filter})
+	return nil, errors.New("UnImplemented")
 }
 
-// UpdateAlarmFilter updates alarm filter
-func (handler *APIHandler) UpdateAlarmFilter(ctx context.Context, filter *voltha.AlarmFilter) (*voltha.AlarmFilter, error) {
-	log.Debugw("UpdateAlarmFilter-request", log.Fields{"filter": *filter})
-	if isTestMode(ctx) {
-		f := &voltha.AlarmFilter{Id: filter.Id}
-		return f, nil
-	}
-	return &voltha.AlarmFilter{}, errors.New("UnImplemented")
+func (handler *APIHandler) UpdateEventFilter(ctx context.Context, filter *voltha.EventFilter) (*voltha.EventFilter, error) {
+	log.Debugw("UpdateEventFilter-request", log.Fields{"filter": *filter})
+	return nil, errors.New("UnImplemented")
 }
 
-// DeleteAlarmFilter deletes alarm filter
-func (handler *APIHandler) DeleteAlarmFilter(ctx context.Context, id *voltha.ID) (*empty.Empty, error) {
-	log.Debugw("DeleteAlarmFilter-request", log.Fields{"id": *id})
-	if isTestMode(ctx) {
-		return &empty.Empty{}, nil
-	}
-	return &empty.Empty{}, errors.New("UnImplemented")
+func (handler *APIHandler) DeleteEventFilter(ctx context.Context, filterInfo *voltha.EventFilter) (*empty.Empty, error) {
+	log.Debugw("DeleteEventFilter-request", log.Fields{"device-id": filterInfo.DeviceId, "filter-id": filterInfo.Id})
+	return nil, errors.New("UnImplemented")
 }
 
-// ListAlarmFilters returns alarm filters
-func (handler *APIHandler) ListAlarmFilters(ctx context.Context, empty *empty.Empty) (*voltha.AlarmFilters, error) {
-	log.Debug("ListAlarmFilters")
-	return &voltha.AlarmFilters{}, errors.New("UnImplemented")
+// GetEventFilter returns all the filters present for a device
+func (handler *APIHandler) GetEventFilter(ctx context.Context, id *voltha.ID) (*voltha.EventFilters, error) {
+	log.Debugw("GetEventFilter-request", log.Fields{"device-id": id})
+	return nil, errors.New("UnImplemented")
 }
 
-// GetAlarmFilter returns alarm filter
-func (handler *APIHandler) GetAlarmFilter(ctx context.Context, id *voltha.ID) (*voltha.AlarmFilter, error) {
-	log.Debug("GetAlarmFilter")
-	return &voltha.AlarmFilter{}, errors.New("UnImplemented")
+// ListEventFilters returns all the filters known to the system
+func (handler *APIHandler) ListEventFilters(ctx context.Context, empty *empty.Empty) (*voltha.EventFilters, error) {
+	log.Debug("ListEventFilter-request")
+	return nil, errors.New("UnImplemented")
 }
 
-// SelfTest executes self test
 func (handler *APIHandler) SelfTest(ctx context.Context, id *voltha.ID) (*voltha.SelfTestResponse, error) {
 	log.Debugw("SelfTest-request", log.Fields{"id": id})
 	if isTestMode(ctx) {
diff --git a/rw_core/mocks/adapter.go b/rw_core/mocks/adapter.go
index 4908573..cbe4af1 100644
--- a/rw_core/mocks/adapter.go
+++ b/rw_core/mocks/adapter.go
@@ -160,13 +160,13 @@
 	return nil
 }
 
-// Suppress_alarm -
-func (ta *Adapter) Suppress_alarm(filter *voltha.AlarmFilter) error { // nolint
+// Suppress_event -
+func (ta *Adapter) Suppress_event(filter *voltha.EventFilter) error { // nolint
 	return nil
 }
 
-// Unsuppress_alarm -
-func (ta *Adapter) Unsuppress_alarm(filter *voltha.AlarmFilter) error { // nolint
+// Unsuppress_event -
+func (ta *Adapter) Unsuppress_event(filter *voltha.EventFilter) error { // nolint
 	return nil
 }