diff --git a/bucklets/onos.bucklet b/bucklets/onos.bucklet
index ba2ed17..ad6ccf6 100644
--- a/bucklets/onos.bucklet
+++ b/bucklets/onos.bucklet
@@ -4,11 +4,14 @@
 FORCE_INSTALL=True
 NONE='NONE'
 
+ONOS_GROUP_ID = 'org.onosproject'
+ONOS_VERSION = '1.6.0-SNAPSHOT'
+
 def osgi_jar(
     name,
     srcs,
-    group_id = 'org.onosproject',
-    version = '1.6.0-SNAPSHOT',
+    group_id = ONOS_GROUP_ID,
+    version = ONOS_VERSION,
     deps = [],
     visibility = ['PUBLIC'],
     license = 'NONE',
@@ -62,7 +65,7 @@
   genrule(
     name = osgi_jar_name,
     bash = bash,
-    out = name + '.jar',
+    out = '%s-%s.jar' % (name, version), #FIXME add version to jar file
     srcs =  glob(['src/main/webapp/**']),
     visibility = [], #intentially, not visible
   )
@@ -110,12 +113,3 @@
     visibility = visibility,
   )
 
-def onos_app(
-    name,
-    **kwargs):
-
-    osgi_jar(
-      name = name,
-      **kwargs
-    )
-