Index: /branches/supervisor/src/main/java/omq/Remote.java
===================================================================
--- /branches/supervisor/src/main/java/omq/Remote.java	(revision 104)
+++ /branches/supervisor/src/main/java/omq/Remote.java	(revision 105)
@@ -17,7 +17,7 @@
 
 	/**
-	 * Returns the UID of a RemoteObject
+	 * Returns the reference of a RemoteObject
 	 * 
-	 * @return UID
+	 * @return reference
 	 */
 	public String getRef();
Index: /branches/supervisor/src/main/java/omq/client/proxy/MultiProxymq.java
===================================================================
--- /branches/supervisor/src/main/java/omq/client/proxy/MultiProxymq.java	(revision 104)
+++ /branches/supervisor/src/main/java/omq/client/proxy/MultiProxymq.java	(revision 105)
@@ -25,5 +25,5 @@
 	private static final String multi = "multi#";
 
-	private String uid;
+	private String reference;
 	private Broker broker;
 	private Serializer serializer;
@@ -33,11 +33,11 @@
 	private transient String serializerType;
 
-	public MultiProxymq(String uid, Class<?> clazz, Broker broker) throws Exception {
-		this.uid = uid;
+	public MultiProxymq(String reference, Class<?> clazz, Broker broker) throws Exception {
+		this.reference = reference;
 		this.broker = broker;
 		serializer = broker.getSerializer();
 
 		Properties env = broker.getEnvironment();
-		exchange = multi + uid;
+		exchange = multi + reference;
 		serializerType = env.getProperty(ParameterQueue.PROXY_SERIALIZER, Serializer.JAVA);
 	}
@@ -52,10 +52,10 @@
 
 		// Add the correlation ID and create a replyTo property
-		BasicProperties props = new BasicProperties.Builder().appId(uid).correlationId(corrId).type(serializerType).build();
+		BasicProperties props = new BasicProperties.Builder().appId(reference).correlationId(corrId).type(serializerType).build();
 
 		byte[] bytesRequest = serializer.serialize(serializerType, request);
 		broker.publishMessge(exchange, routingkey, props, bytesRequest);
 
-		logger.debug("Proxymq: " + uid + " invokes " + methodName + ", corrID" + corrId + ", exchange: " + exchange + ", replyQueue: " + replyQueueName
+		logger.debug("Proxymq: " + reference + " invokes " + methodName + ", corrID" + corrId + ", exchange: " + exchange + ", replyQueue: " + replyQueueName
 				+ ", serializerType: " + serializerType + ", multi call: " + request.isMulti() + ", async call: " + request.isAsync());
 
Index: /branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java
===================================================================
--- /branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java	(revision 104)
+++ /branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java	(revision 105)
@@ -46,5 +46,5 @@
 	private static final String multi = "multi#";
 
-	private String uid;
+	private String reference;
 	private transient String exchange;
 	private transient String multiExchange;
@@ -72,9 +72,9 @@
 	 * Proxymq Constructor.
 	 * 
-	 * This constructor uses an uid to know which object will call. It also uses
+	 * This constructor uses an reference to know which object will call. It also uses
 	 * Properties to set where to send the messages
 	 * 
-	 * @param uid
-	 *            The uid represents the unique identifier of a remote object
+	 * @param reference
+	 *            The reference represents the unique identifier of a remote object
 	 * @param clazz
 	 *            It represents the real class of the remote object. With this
@@ -85,6 +85,6 @@
 	 * @throws Exception
 	 */
-	public Proxymq(String uid, Class<?> clazz, Broker broker) throws Exception {
-		this.uid = uid;
+	public Proxymq(String reference, Class<?> clazz, Broker broker) throws Exception {
+		this.reference = reference;
 		this.broker = broker;
 		rListener = broker.getResponseListener();
@@ -95,5 +95,5 @@
 		env = broker.getEnvironment();
 		exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, "");
-		multiExchange = multi + uid;
+		multiExchange = multi + reference;
 		replyQueueName = env.getProperty(ParameterQueue.RPC_REPLY_QUEUE);
 
@@ -165,9 +165,9 @@
 		} else {
 			exchange = this.exchange;
-			routingkey = uid;
+			routingkey = reference;
 		}
 
 		// Add the correlation ID and create a replyTo property
-		BasicProperties props = new BasicProperties.Builder().appId(uid).correlationId(corrId).replyTo(replyQueueName).type(serializerType)
+		BasicProperties props = new BasicProperties.Builder().appId(reference).correlationId(corrId).replyTo(replyQueueName).type(serializerType)
 				.deliveryMode(deliveryMode).build();
 
@@ -175,5 +175,5 @@
 		byte[] bytesRequest = serializer.serialize(serializerType, request);
 		broker.publishMessge(exchange, routingkey, props, bytesRequest);
-		logger.debug("Proxymq: " + uid + " invokes '" + request.getMethod() + "' , corrID: " + corrId + ", exchange: " + exchange + ", replyQueue: "
+		logger.debug("Proxymq: " + reference + " invokes '" + request.getMethod() + "' , corrID: " + corrId + ", exchange: " + exchange + ", replyQueue: "
 				+ replyQueueName + ", serializerType: " + serializerType + ", multi call: " + request.isMulti() + ", async call: " + request.isAsync()
 				+ ", delivery mode: " + deliveryMode);
@@ -359,5 +359,5 @@
 	@Override
 	public String getRef() {
-		return uid;
+		return reference;
 	}
 
Index: /branches/supervisor/src/main/java/omq/server/InvocationThread.java
===================================================================
--- /branches/supervisor/src/main/java/omq/server/InvocationThread.java	(revision 104)
+++ /branches/supervisor/src/main/java/omq/server/InvocationThread.java	(revision 105)
@@ -35,5 +35,5 @@
 	// RemoteObject
 	private RemoteObject obj;
-	private String UID;
+	private String reference;
 	private Properties env;
 	private boolean idle;
@@ -54,5 +54,5 @@
 	public InvocationThread(RemoteObject obj) throws Exception {
 		this.obj = obj;
-		this.UID = obj.getRef();
+		this.reference = obj.getRef();
 		this.env = obj.getEnv();
 		this.broker = obj.getBroker();
@@ -176,6 +176,6 @@
 		// Get info about which exchange and queue will use
 		String exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, "");
-		String queue = UID;
-		String routingKey = UID;
+		String queue = reference;
+		String routingKey = reference;
 
 		// RemoteObject default queue
@@ -192,5 +192,5 @@
 			channel.queueBind(queue, exchange, routingKey);
 		}
-		logger.info("RemoteObject: " + UID + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: "
+		logger.info("RemoteObject: " + reference + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: "
 				+ exclusive + ", AutoDelete: " + autoDelete);
 
@@ -200,6 +200,6 @@
 
 		// Get info about the multiQueue
-		String multiExchange = multi + UID;
-		// TODO:String multiExchange = multi + exchange + UID;
+		String multiExchange = multi + reference;
+		// TODO:String multiExchange = multi + exchange + reference;
 		multiQueue = env.getProperty(ParameterQueue.MULTI_QUEUE_NAME);
 
@@ -217,5 +217,5 @@
 		}
 		channel.queueBind(multiQueue, multiExchange, "");
-		logger.info("RemoteObject: " + UID + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable
+		logger.info("RemoteObject: " + reference + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable
 				+ ", Exclusive: " + multiExclusive + ", AutoDelete: " + multiAutoDelete);
 
@@ -236,5 +236,5 @@
 
 	public void kill() throws IOException {
-		logger.info("Killing objectmq: " + UID + " thread id");
+		logger.info("Killing objectmq: " + reference + " thread id");
 		killed = true;
 		interrupt();
Index: /branches/supervisor/src/main/java/omq/server/RemoteObject.java
===================================================================
--- /branches/supervisor/src/main/java/omq/server/RemoteObject.java	(revision 104)
+++ /branches/supervisor/src/main/java/omq/server/RemoteObject.java	(revision 105)
@@ -30,5 +30,5 @@
 	private static final Logger logger = Logger.getLogger(RemoteObject.class.getName());
 
-	private String UID;
+	private String reference;
 	private Properties env;
 	private transient Broker broker;
@@ -61,5 +61,5 @@
 	public void startRemoteObject(String reference, Broker broker, Properties env) throws Exception {
 		this.broker = broker;
-		this.UID = reference;
+		this.reference = reference;
 		this.env = env;
 
@@ -87,5 +87,5 @@
 	@Override
 	public String getRef() {
-		return UID;
+		return reference;
 	}