diff --git a/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/message/model/message.hbm.xml b/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/message/model/message.hbm.xml
index 3126295b2931..b6fc05a419c1 100644
--- a/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/message/model/message.hbm.xml
+++ b/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/message/model/message.hbm.xml
@@ -5,11 +5,10 @@
       This represents a sessions presence on a wiki page. One record per session, ideally removed when the 
       session disappears, updated when the user moves from page to page
        -->
-      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.PagePresenceImpl"
-          table="rwikipagepresence" >
-          <id name="id" unsaved-value="null" >
+      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.PagePresenceImpl" table="rwikipagepresence" >
+          <id name="id" type="string" unsaved-value="null" >
               <column name="id" length="36" not-null="true"/>
-              <generator class="uuid.hex" />
+              <generator class="uuid2" />
           </id>
           <property name="sessionid" column="sessionid" index="irwikipp_sessionid" />
           <property name="user" column="userid" not-null="true" index="irwikipp_user" type="string" length="64" />
@@ -20,11 +19,10 @@
       <!-- 
       Preferences as an XML blob. One record per user, updated when the user wants to update
        -->
-      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.PreferenceImpl"
-          table="rwikipreference" >
-          <id name="id" unsaved-value="null" >
+      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.PreferenceImpl" table="rwikipreference" >
+          <id name="id" type="string" unsaved-value="null" >
               <column name="id" length="36" not-null="true"/>
-              <generator class="uuid.hex" />
+              <generator class="uuid2" />
           </id>
           <property name="userid" column="userid" not-null="true" index="irwikipr_userid" type="string" length="64" />
           <property name="lastseen" column="lastseen" type="timestamp" />
@@ -37,11 +35,10 @@
       Added as a user submits chats.
       These are kept
        -->
-      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.RwikiMessageImpl"
-          table="rwikipagemessage" >
-          <id name="id" unsaved-value="null" >
+      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.RwikiMessageImpl" table="rwikipagemessage" >
+          <id name="id" type="string" unsaved-value="null" >
               <column name="id" length="36" not-null="true"/>
-              <generator class="uuid.hex" />
+              <generator class="uuid2" />
           </id>
           <property name="sessionid" column="sessionid"  index="irwikipm_sessionid" />
           <property name="user" column="userid" not-null="true" index="irwikipm_user" type="string" length="64" />
@@ -51,11 +48,10 @@
           <property name="message" type="materialized_clob" />
       </class>
       
-      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.RwikiTriggerImpl"
-          table="rwikipagetrigger" >
-          <id name="id" unsaved-value="null" >
+      <class name="uk.ac.cam.caret.sakai.rwiki.message.model.RwikiTriggerImpl" table="rwikipagetrigger" >
+          <id name="id" type="string" unsaved-value="null" >
               <column name="id" length="36" not-null="true"/>
-              <generator class="uuid.hex" />
+              <generator class="uuid2" />
           </id>
           <property name="user" column="userid" not-null="true" index="irwikipt_user" type="string" length="64" />
           <property name="pagespace" column="pagespace" type="string" index="irwikipt_pagespace" length="255"/>
@@ -63,7 +59,5 @@
           <property name="lastseen" column="lastseen" type="timestamp" />
           <property name="triggerspec" type="materialized_clob" />
       </class>
-      
-      
   </hibernate-mapping>
   
diff --git a/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/model/RWiki.hbm.xml b/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/model/RWiki.hbm.xml
index 49fced4a7f22..558af2e3c804 100644
--- a/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/model/RWiki.hbm.xml
+++ b/rwiki/rwiki-model/src/java/uk/ac/cam/caret/sakai/rwiki/model/RWiki.hbm.xml
@@ -1,62 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="uk.ac.cam.caret.sakai.rwiki.component">
-	
-	<!--
-	Version 2 schema,
-	contains persistant properties of the database, including
-	the version of the schema 
-	 --> 
-	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiPropertyImpl"
-		table="rwikiproperties" >
-		<id name="id" unsaved-value="null" >
+
+	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiPropertyImpl" table="rwikiproperties" >
+		<id name="id" type="string" unsaved-value="null" >
 			<column name="id" length="36" not-null="true"/>
-			<generator class="uuid.hex" />
+			<generator class="uuid2" />
 		</id>
 		<property name="name" column="name" not-null="true" type="string" unique="true" length="255" />
 		<property name="value" column="value" type="string" length="4000" />
 	</class>
-	
-	<!--
-	Version 2 schema
-	contains content of the current object
-	-->
-	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiCurrentObjectContentImpl"
-		table="rwikicurrentcontent" >
-		<id name="id" unsaved-value="null" >
+
+	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiCurrentObjectContentImpl" table="rwikicurrentcontent" >
+		<id name="id" type="string" unsaved-value="null" >
 			<column name="id" length="36" not-null="true"/>
-			<generator class="uuid.hex" />
+			<generator class="uuid2" />
 		</id>
 		<property name="rwikiid" length="36" not-null="true" index="irwikicurrentcontent_rwi" />
-		<property name="content" not-null="false" type="materialized_clob" length="16777215" access="field"/> <!-- SAK-20790, set access to field to prevent Hibernate from calling the getter -->
+		<!-- SAK-20790, set access to field to prevent Hibernate from calling the getter -->
+		<property name="content" not-null="false" type="materialized_clob" length="16777215" access="field"/>
 	</class>
-	<!--
-	Version 2 schema 
-	contains content of history objects.
-	-->
-	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiHistoryObjectContentImpl"
-		table="rwikihistorycontent">
-		<id name="id" unsaved-value="null" >
+
+	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiHistoryObjectContentImpl" table="rwikihistorycontent">
+		<id name="id" type="string" unsaved-value="null" >
 			<column name="id" length="36" not-null="true"/>
-			<generator class="uuid.hex" />
+			<generator class="uuid2" />
 		</id>
 		<property name="rwikiid" length="36" not-null="true" index="irwikihistorycontent_rwi"/>
-		<property name="content" not-null="false" type="materialized_clob" length="16777215" access="field"/> <!-- SAK-20790, set access to field to prevent Hibernate from calling the getter -->
+		<!-- SAK-20790, set access to field to prevent Hibernate from calling the getter -->
+		<property name="content" not-null="false" type="materialized_clob" length="16777215" access="field"/>
 	</class>
-	
-	<!-- 
-	Version 2 schema, refactoed from version 1, 
-	contains detached historical versions
-	-->
-	<class 
-		name="uk.ac.cam.caret.sakai.rwiki.model.RWikiHistoryObjectImpl" 
-		table="rwikihistory" >
-<!--  		<cache usage="nonstrict-read-write" />  remove for the moment, until we know if acceptable -->
-		<id name="id" unsaved-value="null">
+
+	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiHistoryObjectImpl" table="rwikihistory" >
+		<!-- <cache usage="nonstrict-read-write" />  remove for the moment, until we know if acceptable -->
+		<id name="id" type="string" unsaved-value="null">
 			<column name="id" length="36" not-null="true"/>
-			<generator class="uuid.hex"/>
+			<generator class="uuid2"/>
 		</id>
-		
 		<property name="version" type="timestamp" not-null="false"/>		
 		<!-- this is the name of the page -->
 		<property name="name" column="name" not-null="true" index="irwikihistory_name" type="string"  length="255"/>
@@ -83,62 +63,45 @@
 		<property name="groupAdmin" type="boolean" />
 		<property name="publicRead" type="boolean" />
 		<property name="publicWrite" type="boolean" />
-
 		<property name="sha1" length="64" />
-		
-		
 		<property name="revision"  type="int"/>
-
 		<!-- additional properties not in RWiki Object -->		
 		<property name="rwikiobjectid" length="36" not-null="true" index="irwikihistoryobj_rwid"/>
-
 	</class>
 
-	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiCurrentObjectImpl" 
-			table="rwikiobject"
-			optimistic-lock="version">
-<!--		<cache usage="read-write" /> -->
-		<id name="id" unsaved-value="null">
-		<column name="id" length="36" not-null="true"/>
-		<generator class="uuid.hex"/>
-	</id>
-
-	<version name="version" type="timestamp" unsaved-value="null"/>
-
-    <!-- this is the name of the page -->
-    <property name="name" column="name" not-null="true" index="irwikiobject_name" type="string" unique="true" length="255"/>
-	<!-- this is the realm that the page belongs to -->
-	<property name="realm" not-null="false" type="string" index="irwikiobject_realm" length="255" />
-	
-	<!-- this is the content of the wiki -->
-	<!-- MOVED TO SEPERATE CONTENT OBJECT
-	<property name="content" not-null="false" type="materialized_clob" />
-	-->
-
-    <!-- enough for about 400 pages, dont want to use a clob here -->
-	<property name="referenced" not-null="false" length="4000" />
-
-	<!-- the user that edited this page. -->
-	<!-- when versioning is on, the last entry is the last updated -->
-	<!-- the first entry is the creator -->
-	<property name="user" column="userid" not-null="false" length="64" />
-	<property name="owner" not-null="false" length="64" />
-	<!-- access: this is a simple access control list on a page by page basis -->
-	<!-- it specifies read and or write for user, group, and public -->
-	<property name="ownerRead" type="boolean"  />
-	<property name="ownerWrite" type="boolean" />
-	<property name="ownerAdmin" type="boolean" />
-	<property name="groupRead" type="boolean" />
-	<property name="groupWrite" type="boolean" />
-	<property name="groupAdmin" type="boolean" />
-	<property name="publicRead" type="boolean" />
-	<property name="publicWrite" type="boolean" />
-
-	<property name="sha1" length="64" />
-		
-	<property name="revision"  type="int"/>
-		
-  </class>
-
-    
+	<class name="uk.ac.cam.caret.sakai.rwiki.model.RWikiCurrentObjectImpl" table="rwikiobject" optimistic-lock="version">
+		<!-- <cache usage="read-write" /> -->
+		<id name="id" type="string" unsaved-value="null">
+			<column name="id" length="36" not-null="true"/>
+			<generator class="uuid2"/>
+		</id>
+		<version name="version" type="timestamp" unsaved-value="null"/>
+		<!-- this is the name of the page -->
+		<property name="name" column="name" not-null="true" index="irwikiobject_name" type="string" unique="true" length="255"/>
+		<!-- this is the realm that the page belongs to -->
+		<property name="realm" not-null="false" type="string" index="irwikiobject_realm" length="255" />
+		<!-- this is the content of the wiki -->
+		<!-- MOVED TO SEPERATE CONTENT OBJECT
+			<property name="content" not-null="false" type="materialized_clob" />
+		-->
+		<!-- enough for about 400 pages, dont want to use a clob here -->
+		<property name="referenced" not-null="false" length="4000" />
+		<!-- the user that edited this page. -->
+		<!-- when versioning is on, the last entry is the last updated -->
+		<!-- the first entry is the creator -->
+		<property name="user" column="userid" not-null="false" length="64" />
+		<property name="owner" not-null="false" length="64" />
+		<!-- access: this is a simple access control list on a page by page basis -->
+		<!-- it specifies read and or write for user, group, and public -->
+		<property name="ownerRead" type="boolean"  />
+		<property name="ownerWrite" type="boolean" />
+		<property name="ownerAdmin" type="boolean" />
+		<property name="groupRead" type="boolean" />
+		<property name="groupWrite" type="boolean" />
+		<property name="groupAdmin" type="boolean" />
+		<property name="publicRead" type="boolean" />
+		<property name="publicWrite" type="boolean" />
+		<property name="sha1" length="64" />
+		<property name="revision"  type="int"/>
+	</class>
 </hibernate-mapping>
diff --git a/search/search-model/src/java/org/sakaiproject/search/model/impl/search.hbm.xml b/search/search-model/src/java/org/sakaiproject/search/model/impl/search.hbm.xml
index f891098e1874..6948919a07ad 100644
--- a/search/search-model/src/java/org/sakaiproject/search/model/impl/search.hbm.xml
+++ b/search/search-model/src/java/org/sakaiproject/search/model/impl/search.hbm.xml
@@ -2,45 +2,21 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.sakaiproject.search.model.impl">
       
-      <class name="org.sakaiproject.search.model.impl.SearchBuilderItemImpl"
-          table="searchbuilderitem" 
-          optimistic-lock="version">
-          <id name="id" unsaved-value="null" >
+      <class name="org.sakaiproject.search.model.impl.SearchBuilderItemImpl" table="searchbuilderitem" optimistic-lock="version">
+          <id name="id" type="string" unsaved-value="null" >
               <column name="id" length="64" not-null="true"/>
-              <generator class="uuid.hex" />
+              <generator class="uuid2" />
           </id>
           <!-- the last update to the record used for optimistic locks -->    
           <version name="version" type="timestamp" unsaved-value="null"/>
           <!-- this is the resource string -->
-          <property 
-              name="name" 
-              column="name" 
-              not-null="true" 
-              type="string" 
-              unique="true" 
-              length="255" />
-          <property 
-              name="context" 
-              column="context" 
-              not-null="true" 
-              index="isearchbuilderitem_ctx" 
-              type="string" 
-              unique="false" 
-              length="255" />
+          <property name="name" column="name" not-null="true" type="string" unique="true" length="255"/>
+          <property name="context" column="context" not-null="true" index="isearchbuilderitem_ctx" type="string" unique="false" length="255"/>
           <!-- the action to perform add, update, delete -->
-          <property name="searchaction" 
-              column="searchaction" 
-              type="int" 
-              index="isearchbuilderitem_act" />
+          <property name="searchaction" column="searchaction" type="int" index="isearchbuilderitem_act"/>
           <!-- the state of the record, pending, completed -->
-          <property name="searchstate" 
-              column="searchstate" 
-              type="int" 
-              index="isearchbuilderitem_sta" />
-          <property name="itemscope" 
-              column="itemscope" 
-              type="int" 
-              index="isearchbuilderitem_sco" />
+          <property name="searchstate" column="searchstate" type="int" index="isearchbuilderitem_sta"/>
+          <property name="itemscope" column="itemscope" type="int" index="isearchbuilderitem_sco"/>
       </class>
   </hibernate-mapping>