diff --git a/console/basic/src/main/java/tech/uom/demo/basic/UnitDemo.java b/console/basic/src/main/java/tech/uom/demo/basic/UnitDemo.java
index 3c57977d..e703c086 100644
--- a/console/basic/src/main/java/tech/uom/demo/basic/UnitDemo.java
+++ b/console/basic/src/main/java/tech/uom/demo/basic/UnitDemo.java
@@ -33,6 +33,7 @@
 import javax.measure.quantity.Speed;
 import javax.measure.quantity.Volume;
 
+import tech.units.indriya.AbstractUnit;
 import tech.units.indriya.quantity.Quantities;
 import javax.measure.MetricPrefix;
 import javax.measure.Quantity;
@@ -55,6 +56,7 @@ public static void main(String[] args) {
 //		System.out.println(UCUM.POUND.getName());
 		
 		System.out.println(Units.KILOGRAM);
+		//System.out.println(Units.KILOGRAM.isEquivalentTo(AbstractUnit.ONE)); doesn't compile
 		System.out.println(Units.KILOGRAM.getSymbol());
 		System.out.println(Units.KILOGRAM.getName());
 		
diff --git a/console/systems/ucum/src/main/java/tech/uom/demo/systems/ucum/UCUMServiceDemo.java b/console/systems/ucum/src/main/java/tech/uom/demo/systems/ucum/UCUMServiceDemo.java
index 252dc79e..54c73b90 100644
--- a/console/systems/ucum/src/main/java/tech/uom/demo/systems/ucum/UCUMServiceDemo.java
+++ b/console/systems/ucum/src/main/java/tech/uom/demo/systems/ucum/UCUMServiceDemo.java
@@ -25,12 +25,14 @@
  */
 package tech.uom.demo.systems.ucum;
 
+import static javax.measure.spi.FormatService.FormatType.UNIT_FORMAT;
+
 import java.util.List;
 
 import javax.measure.Unit;
 import javax.measure.format.UnitFormat;
 import javax.measure.spi.ServiceProvider;
-import javax.measure.spi.UnitFormatService;
+import javax.measure.spi.FormatService;
 
 public class UCUMServiceDemo {
 
@@ -42,7 +44,7 @@ public static void main(String[] args) {
         System.out.println();
         System.out.println(ServiceProvider.current());
         
-        for (String formatName : ServiceProvider.current().getFormatService().getAvailableFormatNames()) {
+        for (String formatName : ServiceProvider.current().getFormatService().getAvailableFormatNames(UNIT_FORMAT)) {
             System.out.println(formatName);
         }
         
@@ -67,7 +69,7 @@ public static void main(String[] args) {
         
         List<ServiceProvider> providers = ServiceProvider.available();
         ServiceProvider ucumProvider = providers.get(0);
-        UnitFormatService ucumFormatService = ucumProvider.getFormatService();
+        FormatService ucumFormatService = ucumProvider.getFormatService();
         UnitFormat ucumFormatter = ucumFormatService.getUnitFormat("CS");
         System.out.println("m3 dimension =" + ucumFormatter.parse("m3").getDimension());        
         System.out.println("ft3 (wrong) dimension =" + ucumFormatter.parse("ft3").getDimension());
diff --git a/pom.xml b/pom.xml
index b19b5066..1d7a3d97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom</groupId>
 		<artifactId>uom-parent</artifactId>
-		<version>2.1-SNAPSHOT</version>
+		<version>2.1</version>
 	</parent>
 	<groupId>tech.uom.demo</groupId>
 	<artifactId>uom-demos</artifactId>
@@ -32,8 +32,8 @@
 		<project.build.javaVersion>${jdkVersion}</project.build.javaVersion>
 		<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
 		<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
-		<ri.version>2.1-SNAPSHOT</ri.version>
-		<lib.version>2.1-SNAPSHOT</lib.version>
+		<ri.version>2.1</ri.version>
+		<lib.version>2.1</lib.version>
 		<si.version>2.1-SNAPSHOT</si.version>
 		<systems.version>2.1-SNAPSHOT</systems.version>
 	</properties>