diff --git a/common/core.h b/common/core.h
index feb33bc..78cbb0f 100644
--- a/common/core.h
+++ b/common/core.h
@@ -31,12 +31,12 @@
 Status Enable_(int argc, char *argv[]);
 Status ActivateOnu_(uint32_t intf_id, uint32_t onu_id,
     const char *vendor_id, const char *vendor_specific, uint32_t pir,
-    uint32_t agg_port_id, uint32_t alloc_id);
+    uint32_t alloc_id);
 Status DeactivateOnu_(uint32_t intf_id, uint32_t onu_id,
     const char *vendor_id, const char *vendor_specific);
 Status DeleteOnu_(uint32_t intf_id, uint32_t onu_id,
     const char *vendor_id, const char *vendor_specific,
-    uint32_t agg_port_id, uint32_t alloc_id);
+    uint32_t alloc_id);
 Status EnablePonIf_(uint32_t intf_id);
 Status DisablePonIf_(uint32_t intf_id);
 Status EnableUplinkIf_(uint32_t intf_id);
diff --git a/common/server.cc b/common/server.cc
index 433ecd5..e40f0cf 100644
--- a/common/server.cc
+++ b/common/server.cc
@@ -68,8 +68,7 @@
             request->onu_id(),
             ((request->serial_number()).vendor_id()).c_str(),
             ((request->serial_number()).vendor_specific()).c_str(),
-            request->pir(), request->agg_port_id(),
-            request->sched_id());
+            request->pir(), request->alloc_id());
     }
 
     Status DeactivateOnu(
@@ -92,7 +91,7 @@
             request->onu_id(),
             ((request->serial_number()).vendor_id()).c_str(),
             ((request->serial_number()).vendor_specific()).c_str(),
-            request->agg_port_id(), request->sched_id());
+            request->alloc_id());
     }
 
     Status OmciMsgOut(