Index: ruby/branches/0.5.0/lib/open_ehr/rm/support/assumed_types.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/support/assumed_types.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/support/assumed_types.rb	(revision 167)
@@ -2,8 +2,8 @@
 # and am, I will integrated to /lib/models/assumed_types.rb.
 # By Shinji KOBAYASHI, 2008-07-20
-module OpenEHR
+module OpenEhr
   module RM
     module Support
-      module Assumed_Types
+      module AssumedTypes
         class Interval
           attr_accessor :lower, :upper
Index: ruby/branches/0.5.0/lib/open_ehr/rm/support/definition.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/support/definition.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/support/definition.rb	(revision 167)
@@ -1,12 +1,12 @@
-module OpenEHR
+module OpenEhr
   module RM
     module Support
       module Definition
-        module Basic_Definition
+        module BasicDefinition
           CR = "\015"
           LF = "\012"
         end
-        class OpenEHR_Definitions
-          include Basic_Definition          
+        class OpenEHRDefinitions
+          include BasicDefinition
         end
       end
Index: ruby/branches/0.5.0/lib/open_ehr/rm/support/identification.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/support/identification.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/support/identification.rb	(revision 167)
@@ -2,10 +2,9 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109331021343_528780_2066Report.html
 # Ticket refs #39
-module OpenEHR
+module OpenEhr
   module RM
     module Support
       module Identification
-
-        class Object_ID
+        class ObjectId
           attr_reader :value
 
@@ -23,5 +22,5 @@
         end # of ObjectID
 
-        class Object_Ref
+        class ObjectRef
           attr_reader :namespace, :type, :id
 
@@ -48,5 +47,5 @@
         end
 
-        class Archetype_ID < Object_ID
+        class ArchetypeId < ObjectId
           attr_reader :domain_concept, :rm_name, :rm_entity, :rm_originator, :specialisation, :version_id
 
@@ -91,5 +90,5 @@
         end
 
-        class Terminology_ID < Object_ID
+        class TerminologyId < ObjectId
           attr_reader :name, :version_id
 
@@ -130,5 +129,5 @@
         end # of Terminology_ID
 
-        class Generic_ID < Object_ID
+        class GenericId < ObjectId
           attr_reader :scheme
 
@@ -144,9 +143,9 @@
         end # of Generic_ID
 
-        class Template_ID < Object_ID
-
-        end
-
-        class UID_Based_ID < Object_ID
+        class TemplateId < ObjectId
+
+        end
+
+        class UidBasedId < ObjectId
           def initialize(value)
             super(value)
@@ -174,5 +173,5 @@
         end
 
-        class Object_Version_ID < UID_Based_ID
+        class ObjectVersionId < UidBasedId
           attr_reader :object_id, :creating_system_id, :version_tree_id
 
@@ -184,7 +183,7 @@
             super(value)
             if /^(\w+)::(\w+)::((\d|\.)+)$/ =~ value
-              self.object_id = UID.new($1)
-              self.creating_system_id = UID.new($2)
-              self.version_tree_id = Version_Tree_ID.new($3)
+              self.object_id = Uid.new($1)
+              self.creating_system_id = Uid.new($2)
+              self.version_tree_id = VersionTreeId.new($3)
             else
               raise ArgumentError, 'invalid format'
@@ -216,5 +215,5 @@
         end
 
-        class Locatable_Ref < Object_Ref
+        class LocatableRef < ObjectRef
           attr_reader :namespace, :type, :id, :path
 
@@ -234,5 +233,5 @@
         end
 
-        class Party_Ref < Object_Ref
+        class PartyRef < ObjectRef
 
           def type=(type)
@@ -243,5 +242,5 @@
         end
 
-        class Access_Group_Ref < Object_Ref
+        class AccessGroupRef < ObjectRef
           def type=(type)
             raise ArgumentError, 'type invalid' unless type == 'ACCESS_GROUP'
@@ -250,9 +249,9 @@
         end
 
-        class Hier_Object_ID < UID_Based_ID
-
-        end
-
-        class Version_Tree_ID
+        class HierObjectId < UidBasedId
+
+        end
+
+        class VersionTreeId
           attr_reader :value, :trunk_version, :branch_number, :branch_version
 
@@ -303,5 +302,5 @@
         end
 
-        class UID
+        class Uid
           attr_reader :value
 
@@ -316,13 +315,13 @@
         end
 
-        class UUID < UID
-
-        end
-
-        class Internet_ID <UID
+        class Uuid < Uid
+
+        end
+
+        class InternetId <Uid
           
         end
 
-        class ISO_OID <UID
+        class IsoOid <Uid
 
         end        
Index: ruby/branches/0.5.0/lib/open_ehr/rm/support/measurement.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/support/measurement.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/support/measurement.rb	(revision 167)
@@ -1,9 +1,9 @@
-module OpenEHR
+module OpenEhr
   module RM
     module Support
       module Measurement
-        class Measurement_Service
+        class MeasurementService
         end
-        module External_Environment_Access
+        module ExternalEnvironmentAccess
           def eea_terminology_svc
           end
Index: ruby/branches/0.5.0/lib/open_ehr/rm/support/terminology.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/support/terminology.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/support/terminology.rb	(revision 167)
@@ -1,8 +1,8 @@
 
-module OpenEHR
+module OpenEhr
   module RM
     module Support
       module Terminology
-        class Code_Set_Access
+        class CodeSetAccess
           def all_codes
             raise NotImplementedError, "all_codes must be implemented"
@@ -18,5 +18,5 @@
           end
         end
-        module OpenEHR_Code_Set_Identifier
+        module OpenEhrCodeSetIdentifier
           CODE_SET_ID_CHARACER_SETS = "character sets".freeze
           CODE_SET_ID_COMPRESSION_ALGORITHMS = "compression algorithms".freeze
@@ -29,5 +29,5 @@
           end
         end
-        module OpenEHR_Terminology_Group_Identifiers
+        module OpenEhrTerminologyGroupIdentifiers
           GROUP_ID_ATTESTATION_REASON = "attestation reason".freeze
           GROUP_ID_AUDIT_CHANGE_TYPE = "audit change type".freeze
@@ -46,5 +46,5 @@
           TERMINOLOGY_ID = "openehr".freeze
         end
-        class Terminology_Access
+        class TerminologyAccess
           def all_codes
             raise NotImplementedError, "all_codes is not implemented"
@@ -74,6 +74,6 @@
           end
         end
-        class Terminology_Service
-          include OpenEHR_Code_Set_Identifier, OpenEHR_Terminology_Group_Identifiers
+        class TerminologyService
+          include OpenEhrCodeSetIdentifier, OpenEhrTerminologyGroupIdentifiers
           def code_set(name)
             raise NotImplementedError, "code_set is not implemented"
