Index: ruby/branches/0.5.0/lib/open_ehr/rm/common/archetyped.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/common/archetyped.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/common/archetyped.rb	(revision 167)
@@ -2,9 +2,9 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109318114715_211173_0Report.html
 # Ticket refs #65
-module OpenEHR
+module OpenEhr
   module RM
     module Common
       module Archetyped
-        module Locater_Constants
+        module LocaterConstants
           CURRENT_TRANSACTION_ID = "current"
           FRAGMENT_SEPARATOR = "#"
@@ -43,5 +43,5 @@
 
         class Locatable < Pathable
-          include Locater_Constants
+          include LocaterConstants
           attr_reader :archetype_node_id, :name, :links
           attr_accessor :uid, :archetype_details, :feeder_audit
@@ -138,5 +138,5 @@
         end # of Link
 
-        class Feeder_Audit
+        class FeederAudit
           attr_reader :originating_system_audit
           attr_accessor :originating_system_item_ids, :feeder_system_audit,
@@ -157,7 +157,7 @@
             @originating_system_audit = originating_system_audit
           end
-        end # of Feeder_Audit
+        end # of FeederAudit
 
-        class Feeder_Audit_Details
+        class FeederAuditDetails
           attr_reader :system_id
           attr_accessor :provider, :location, :time, :subject, :version_id
@@ -176,5 +176,5 @@
             @system_id = system_id
           end
-        end # of Feeder_Audit_Details
+        end # of FeederAudit_Details
       end # of Archetyped
     end # of Common
Index: ruby/branches/0.5.0/lib/open_ehr/rm/common/change_control.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/common/change_control.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/common/change_control.rb	(revision 167)
@@ -3,8 +3,8 @@
 # Ticket refs #64
 
-module OpenEHR
+module OpenEhr
   module RM
     module Common
-      module Change_Control
+      module ChangeControl
         class Contribution
           attr_reader :uid, :versions, :audit
@@ -93,5 +93,5 @@
 
           def owner_id
-            return Hier_Object_ID.new(@uid.object_id.value)
+            return HierObjectId.new(@uid.object_id.value)
           end
 
@@ -105,5 +105,5 @@
         end
 
-        class Imported_Version < Version
+        class ImportedVersion < Version
           attr_reader :item
 
@@ -126,5 +126,5 @@
         end
 
-        class Original_Version < Version
+        class OriginalVersion < Version
           attr_reader :attestations, :other_input_version_uids
 
@@ -155,5 +155,5 @@
         end
 
-        class Versioned_Object
+        class VersionedObject
           attr_reader :uid, :owner_id, :time_created, :all_versions
 
@@ -208,5 +208,5 @@
               raise ArgumentError, 'invalid a_ver_id'
             end
-            return @all_versions[self.all_version_ids.index(a_ver_id)].instance_of? Original_Version
+            return @all_versions[self.all_version_ids.index(a_ver_id)].instance_of? OriginalVersion
           end
 
@@ -267,17 +267,17 @@
             @all_versions.each do |ver|
               audits = [ ]
-              if ver.instance_of? Original_Version
+              if ver.instance_of? OriginalVersion
                 audits << ver.attestations
               end
               audits << ver.commit_audit
-              revision_history_items << Revision_History_Item.new(
+              revision_history_items << RevisionHistoryItem.new(
                                           :audits => audits,
                                           :version_id => ver.uid)
             end
-            return Revision_History.new(revision_history_items)
+            return RevisionHistory.new(revision_history_items)
           end
 
           def commit_original_version(args={ })
-            @all_versions << Original_Version.new(:uid => args[:uid],
+            @all_versions << OriginalVersion.new(:uid => args[:uid],
                                                   :preceding_version_uid => args[:preceding_version_uid],
                                                   :contribution => args[:contribution],
@@ -290,5 +290,5 @@
 
           def commit_original_merged_version(args = { })
-            @all_versions << Original_Version.new(:uid => args[:uid],
+            @all_versions << OriginalVersion.new(:uid => args[:uid],
                                                   :contribution => args[:contribution],
                                               :preceding_version_uid => args[:preceding_version_uid],
@@ -302,5 +302,5 @@
 
           def commit_imported_version(args = { })
-            @all_versions << Imported_Version.new(:item => args[:item],
+            @all_versions << ImportedVersion.new(:item => args[:item],
                                                   :contribution => args[:contribution],
                                                   :commit_audit => args[:commit_audit])
@@ -319,5 +319,5 @@
           end
         end
-      end # of Change_Control
+      end # of ChangeControl
     end # of Common
   end # of RM
Index: ruby/branches/0.5.0/lib/open_ehr/rm/common/directory.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/common/directory.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/common/directory.rb	(revision 167)
@@ -2,10 +2,10 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140536622627_218703_7149Report.html
 # Ticket refs #63
-include OpenEHR::RM::Data_Types::Text
-module OpenEHR
+include OpenEhr::RM::DataTypes::Text
+module OpenEhr
   module RM
     module Common
       module Directory
-        class Folder < OpenEHR::RM::Common::Archetyped::Locatable
+        class Folder < OpenEhr::RM::Common::Archetyped::Locatable
           attr_accessor :items
           attr_reader :folders
@@ -22,5 +22,5 @@
           end
         end        
-        class Versioned_Folder < OpenEHR::RM::Common::Change_Control::Versioned_Object
+        class VersionedFolder < OpenEhr::RM::Common::ChangeControl::VersionedObject
         end
       end # of Directory
Index: ruby/branches/0.5.0/lib/open_ehr/rm/common/generic.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/common/generic.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/common/generic.rb	(revision 167)
@@ -2,11 +2,11 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140169202660_257304_813Report.html
 # Related to the ticket #62
-include OpenEHR::RM::Support::Identification
-include OpenEHR::RM::Data_Types::Basic
-module OpenEHR
+include OpenEhr::RM::Support::Identification
+include OpenEhr::RM::DataTypes::Basic
+module OpenEhr
   module RM
     module Common
       module Generic
-        class Audit_Details
+        class AuditDetails
           attr_reader :system_id, :committer, :time_committed, :change_type
           attr_accessor :description
@@ -45,5 +45,5 @@
         end
 
-        class Revision_History
+        class RevisionHistory
           attr_reader :items
 
@@ -66,7 +66,7 @@
             return @items.last.audits.first.time_committed.value
           end
-        end # of Revision_History
+        end # of RevisionHistory
 
-        class Revision_History_Item
+        class RevisionHistoryItem
           attr_reader :version_id, :audits
 
@@ -87,7 +87,7 @@
             @version_id = version_id
           end
-        end # of Revision_History_Item
+        end # of RevisionHistory_Item
 
-        class Party_Proxy
+        class PartyProxy
           attr_accessor :external_ref
 
@@ -97,9 +97,9 @@
         end
 
-        class Party_Self < Party_Proxy
+        class PartySelf < PartyProxy
 
         end
 
-        class Party_Identified < Party_Proxy
+        class PartyIdentified < PartyProxy
           attr_reader :name, :identifier
           def initialize(args = { })
@@ -132,5 +132,5 @@
         end
 
-        class Party_Related < Party_Identified
+        class PartyRelated < PartyIdentified
           attr_reader :relationship
           def initialize(args = { })
@@ -174,5 +174,5 @@
         end
 
-        class Attestation < Audit_Details
+        class Attestation < AuditDetails
           attr_reader :reason
           attr_accessor :proof, :items
Index: ruby/branches/0.5.0/lib/open_ehr/rm/common/resource.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/common/resource.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/common/resource.rb	(revision 167)
@@ -1,8 +1,8 @@
 require 'set'
-module OpenEHR
+module OpenEhr
   module RM
     module Common
       module Resource
-        class Authored_Resource
+        class AuthoredResource
           attr_reader  :original_language, :translations
           attr_accessor :description, :revision_history
@@ -42,5 +42,5 @@
         end
 
-        class Translation_Details
+        class TranslationDetails
           attr_reader :language, :author
           attr_accessor :accreditation, :other_details
@@ -64,5 +64,5 @@
         end
 
-        class Resource_Description
+        class ResourceDescription
           attr_reader :original_author, :lifecycle_state, :details
           attr_accessor :other_contributors, :resource_package_uri,
@@ -101,5 +101,5 @@
         end
 
-        class Resource_Description_Item
+        class ResourceDescriptionItem
           attr_reader :language, :purpose, :use, :misuse, :copyright
           attr_accessor :keywords, :original_resource_uri, :other_details
