diff --git a/ipaacalib/java/src/ipaaca/Buffer.java b/ipaacalib/java/src/ipaaca/Buffer.java
index 95f61fb10a6330b4cc78b317c8ae12b6e575b413..993c2d27fc1c035e474462b7328b3a98fd036c96 100644
--- a/ipaacalib/java/src/ipaaca/Buffer.java
+++ b/ipaacalib/java/src/ipaaca/Buffer.java
@@ -46,9 +46,14 @@ public abstract class Buffer
     private final String owningComponentName;
 
     private List<IUEventHandler> eventHandlers = new ArrayList<IUEventHandler>();
-    protected final String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+    protected final String uuid = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
     protected String uniqueName;
 
+    public String getUniqueShortName()
+    {
+    	return owningComponentName + "ID" + uuid;
+    }
+    
     public String getUniqueName()
     {
         return uniqueName;
diff --git a/ipaacalib/java/src/ipaaca/InputBuffer.java b/ipaacalib/java/src/ipaaca/InputBuffer.java
index e5542c3d7e3ff8d8c13a5588c192ada84a435020..df7affe49193f08d8aabc4eef19edaf09cfb0961 100644
--- a/ipaacalib/java/src/ipaaca/InputBuffer.java
+++ b/ipaacalib/java/src/ipaaca/InputBuffer.java
@@ -123,7 +123,7 @@ public class InputBuffer extends Buffer
     public InputBuffer(String owningComponentName, Set<String> categoryInterests)
     {
         super(owningComponentName);
-        uniqueName = "/ipaaca/component/" + owningComponentName + "ID" + uuid + "/IB";
+        uniqueName = "/ipaaca/component/" + getUniqueShortName() + "/IB";
 
         for (String cat : categoryInterests)
         {
diff --git a/ipaacalib/java/src/ipaaca/OutputBuffer.java b/ipaacalib/java/src/ipaaca/OutputBuffer.java
index 999e2e51a2b1375a08f525b16c55cb517852b8dc..35bdae69e8eb5917791cda1ff811869fecfe2820 100644
--- a/ipaacalib/java/src/ipaaca/OutputBuffer.java
+++ b/ipaacalib/java/src/ipaaca/OutputBuffer.java
@@ -93,7 +93,7 @@ public class OutputBuffer extends Buffer
     {
         super(owningComponentName);
 
-        uniqueName = "/ipaaca/component/" + owningComponentName + "ID" + uuid + "/OB";
+        uniqueName = "/ipaaca/component/" + getUniqueShortName() + "/OB";
         logger.debug("Creating server for {}", uniqueName);
         server = Factory.getInstance().createLocalServer(uniqueName);
         try
diff --git a/ipaacalib/python/src/ipaaca/__init__.py b/ipaacalib/python/src/ipaaca/__init__.py
index 538bffaf8c877e2eaf083c325f20918a2f8582c0..1aeff8426d0002d77326fd55c686c70f1bdce698 100755
--- a/ipaacalib/python/src/ipaaca/__init__.py
+++ b/ipaacalib/python/src/ipaaca/__init__.py
@@ -247,7 +247,7 @@ class Payload(dict):
 		self._collected_modifications = {}
 		self._collected_removals = []
 		self._update_on_every_change = True
-		self.batch_update_lock.release()
+		self._batch_update_lock.release()
 
 	def _remotely_enforced_setitem(self, k, v):
 		"""Sets an item when requested remotely."""