diff --git a/src/bgp/bgp_config_listener.cc b/src/bgp/bgp_config_listener.cc
index 8256ee0aef6..c9ca663a5d2 100644
--- a/src/bgp/bgp_config_listener.cc
+++ b/src/bgp/bgp_config_listener.cc
@@ -58,7 +58,7 @@ void BgpConfigListener::DependencyTrackerInit() {
         ("connection", list_of("self"))
         ("virtual-network-routing-instance", list_of("self"))
         ("routing-policy-routing-instance", list_of("self"))
-        ("routing-instance-route-aggregate", list_of("self"));
+        ("route-aggregate-routing-instance", list_of("self"));
     policy->insert(make_pair("routing-instance", rt_instance_react));
 
     ReactionMap routing_policy_assoc_react = map_list_of<string, PropagateList>
@@ -78,6 +78,6 @@ void BgpConfigListener::DependencyTrackerInit() {
     policy->insert(make_pair("virtual-network", virtual_network_react));
 
     ReactionMap route_aggregate_react = map_list_of<string, PropagateList>
-        ("self", list_of("routing-instance-route-aggregate"));
+        ("self", list_of("route-aggregate-routing-instance"));
     policy->insert(make_pair("route-aggregate", route_aggregate_react));
 }
diff --git a/src/bgp/bgp_config_parser.cc b/src/bgp/bgp_config_parser.cc
index 9c0178a0a34..01ee3cfc0bc 100644
--- a/src/bgp/bgp_config_parser.cc
+++ b/src/bgp/bgp_config_parser.cc
@@ -306,11 +306,11 @@ static bool ParseInstanceRouteAggregate(const string &instance,
     if (add_change) {
         MapObjectLinkAttr("routing-instance", instance,
             "route-aggregate", aggregate_name,
-            "routing-instance-route-aggregate", NULL, requests);
+            "route-aggregate-routing-instance", NULL, requests);
     } else {
         MapObjectUnlink("routing-instance", instance,
             "route-aggregate", aggregate_name,
-            "routing-instance-route-aggregate", requests);
+            "route-aggregate-routing-instance", requests);
     }
 
     return true;
diff --git a/src/bgp/test/bgp_config_listener_test.cc b/src/bgp/test/bgp_config_listener_test.cc
index 9b34259110e..3ce047f2f34 100644
--- a/src/bgp/test/bgp_config_listener_test.cc
+++ b/src/bgp/test/bgp_config_listener_test.cc
@@ -2056,7 +2056,7 @@ TEST_F(BgpConfigListenerTest, RouteAggregate_1) {
     PauseChangeListPropagation();
     // unlink routing instance and route aggregate
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     TASK_UTIL_EXPECT_EQ(0, GetChangeListCount());
@@ -2089,7 +2089,7 @@ TEST_F(BgpConfigListenerTest, RouteAggregate_2) {
 
     // unlink routing instance and route aggregate
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     TASK_UTIL_EXPECT_EQ(0, GetChangeListCount());
@@ -2097,7 +2097,7 @@ TEST_F(BgpConfigListenerTest, RouteAggregate_2) {
     PauseChangeListPropagation();
     // link routing instance and route aggregate
     ifmap_test_util::IFMapMsgLink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
     TASK_UTIL_EXPECT_EQ(0, GetChangeListCount());
     TASK_UTIL_EXPECT_EQ(0, GetNodeListCount());
@@ -2129,7 +2129,7 @@ TEST_F(BgpConfigListenerTest, RouteAggregate_3) {
 
     // unlink routing instance and route aggregate
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     TASK_UTIL_EXPECT_EQ(0, GetChangeListCount());
@@ -2241,7 +2241,7 @@ TEST_F(BgpConfigListenerTest, RouteAggregate_6) {
     PauseChangeListPropagation();
     // unlink routing instance and route aggregate
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test_0",
-        "route-aggregate", "vn_subnet_0", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet_0", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     TASK_UTIL_EXPECT_EQ(0, GetChangeListCount());
diff --git a/src/bgp/test/bgp_ifmap_config_manager_test.cc b/src/bgp/test/bgp_ifmap_config_manager_test.cc
index 90ce7c9a16e..5f9d4bb4f04 100644
--- a/src/bgp/test/bgp_ifmap_config_manager_test.cc
+++ b/src/bgp/test/bgp_ifmap_config_manager_test.cc
@@ -2250,7 +2250,7 @@ TEST_F(BgpIfmapConfigManagerTest, RouteAggregate_Unlink) {
 
     // unlink routing instance and route aggregate
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet_0", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet_0", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     ASSERT_TRUE(test_ri->aggregate_routes(Address::INET).size() == 0);
@@ -2258,7 +2258,7 @@ TEST_F(BgpIfmapConfigManagerTest, RouteAggregate_Unlink) {
 
     // Link routing instance and route aggregate
     ifmap_test_util::IFMapMsgLink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet_0", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet_0", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     ASSERT_TRUE(test_ri->aggregate_routes(Address::INET).size() == 1);
@@ -2472,9 +2472,9 @@ TEST_F(BgpIfmapConfigManagerTest, RouteAggregate_MultipleInet_Unlink) {
 
     // unlink routing instance and route aggregate
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet_0", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet_0", "route-aggregate-routing-instance");
     ifmap_test_util::IFMapMsgUnlink(&db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet_1", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet_1", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     ASSERT_TRUE(test_ri->aggregate_routes(Address::INET).size() == 1);
diff --git a/src/bgp/test/route_aggregation_test.cc b/src/bgp/test/route_aggregation_test.cc
index d4740e9f486..8a9cd330e09 100644
--- a/src/bgp/test/route_aggregation_test.cc
+++ b/src/bgp/test/route_aggregation_test.cc
@@ -531,7 +531,7 @@ TEST_F(RouteAggregationTest, ConfigDelete) {
 
     // Unlink the route aggregate config from vrf
     ifmap_test_util::IFMapMsgUnlink(&config_db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     VERIFY_EQ(2, RouteCount("test.inet.0"));
@@ -669,12 +669,12 @@ TEST_F(RouteAggregationTest, ConfigDelete_Add) {
 
     // Unlink the route aggregate config from vrf
     ifmap_test_util::IFMapMsgUnlink(&config_db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     // Link the route aggregate config from vrf
     ifmap_test_util::IFMapMsgLink(&config_db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     EnableUnregResolveTask("test", Address::INET);
@@ -876,7 +876,7 @@ TEST_F(RouteAggregationTest, ConfigDelete_DelayedRouteProcessing) {
 
     // Unlink the route aggregate config from vrf
     ifmap_test_util::IFMapMsgUnlink(&config_db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     EnableRouteAggregateUpdate("test", Address::INET);
@@ -920,7 +920,7 @@ TEST_F(RouteAggregationTest, ConfigDelete_DelayedRouteProcessing_1) {
     DisableRouteAggregateUpdate("test", Address::INET);
     // Unlink the route aggregate config from vrf
     ifmap_test_util::IFMapMsgUnlink(&config_db_, "routing-instance", "test",
-        "route-aggregate", "vn_subnet", "routing-instance-route-aggregate");
+        "route-aggregate", "vn_subnet", "route-aggregate-routing-instance");
     task_util::WaitForIdle();
 
     EnableRouteAggregateUpdate("test", Address::INET);
diff --git a/src/schema/bgp_schema.xsd b/src/schema/bgp_schema.xsd
index bb97122be21..eaa5d67cbf7 100644
--- a/src/schema/bgp_schema.xsd
+++ b/src/schema/bgp_schema.xsd
@@ -39,10 +39,10 @@
 <!--#IFMAP-SEMANTICS-IDL
      Property('aggregate-route-entries', 'route-aggregate') -->
 
-<xsd:element name="routing-instance-route-aggregate"/>
+<xsd:element name="route-aggregate-routing-instance"/>
 <!--#IFMAP-SEMANTICS-IDL
-     Link('routing-instance-route-aggregate',
-          'routing-instance', 'route-aggregate', ['ref']) -->
+     Link('route-aggregate-routing-instance',
+          'route-aggregate', 'routing-instance', ['ref']) -->
 
 <xsd:simpleType name="SequenceNumberType">
     <xsd:annotation>