diff --git a/apps/routing/BUCK b/apps/routing/BUCK
index b725adf..8483685 100644
--- a/apps/routing/BUCK
+++ b/apps/routing/BUCK
@@ -1,39 +1,20 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-app-routing'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:org.apache.karaf.shell.console',
     '//lib:concurrent-trees',
     '//cli:onos-cli',
     '//incubator/api:onos-incubator-api',
-    '//apps/routing-api:onos-app-routing-api',
+    '//apps/routing-api:onos-apps-routing-api',
     '//core/common:onos-core-common',
 ]
 
 TEST_DEPS = [
     '//lib:TEST_ADAPTERS',
     '//incubator/api:onos-incubator-api-tests',
-    '//apps/routing-api:onos-app-routing-api-tests',
+    '//apps/routing-api:onos-apps-routing-api-tests',
 ]
 
-java_library(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
-)
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
+    test_deps = TEST_DEPS,
 )