Index: ruby/branches/0.5.0/lib/open_ehr/rm/data_types/quantity/date_time.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/data_types/quantity/date_time.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/data_types/quantity/date_time.rb	(revision 167)
@@ -5,10 +5,10 @@
 require 'date'
 
-module OpenEHR
+module OpenEhr
   module RM
-    module Data_Types
+    module DataTypes
       module Quantity
-        module Date_Time
-          class DV_Temporal < OpenEHR::RM::Data_Types::Quantity::DV_Absolute_Quantity
+        module DateTime
+          class DvTemporal < OpenEhr::RM::DataTypes::Quantity::DvAbsoluteQuantity
             include Comparable
             attr_reader :value
@@ -37,6 +37,6 @@
           end
 
-          class DV_Date < DV_Temporal
-            include OpenEHR::Assumed_Library_Types::ISO8601_DATE_MODULE
+          class DvDate < DvTemporal
+            include OpenEhr::AssumedLibraryTypes::ISO8601_DATE_MODULE
 
             DAYS_IN_MONTH = [0,31,28,31,30,31,30,31,31,30,31,30,31]
@@ -51,5 +51,5 @@
             def value=(value)
               super(value)
-              iso8601_date = Assumed_Library_Types::ISO8601_DATE.new(value)
+              iso8601_date = AssumedLibraryTypes::ISO8601_DATE.new(value)
               @year = iso8601_date.year
               @month = iso8601_date.month
@@ -91,5 +91,5 @@
               end
               year += future.year - past.year
-              return DV_Duration.new(
+              return DvDuration.new(
                    'P' + year.to_s + 'Y' + month.to_s + 'M' + 
                          week.to_s + 'W' + day.to_s + 'D')
@@ -97,6 +97,6 @@
           end
           
-          class DV_Time < DV_Temporal
-            include OpenEHR::Assumed_Library_Types::ISO8601_TIME_MODULE
+          class DvTime < DvTemporal
+            include OpenEhr::AssumedLibraryTypes::ISO8601_TIME_MODULE
             def initialize(value, magnitude_status=nil, accuracy=nil,
                            normal_range=nil, normal_status=nil,
@@ -108,5 +108,5 @@
             def value=(value)
               super(value)
-              iso8601_time = Assumed_Library_Types::ISO8601_TIME.new(value)
+              iso8601_time = AssumedLibraryTypes::ISO8601_TIME.new(value)
               @hour = iso8601_time.hour
               @minute = iso8601_time.minute
@@ -125,5 +125,5 @@
               second = (diff - hour * 60 *60 - minute * 60).to_i
               fractional_second = ((diff - diff.to_i)*1000000.0).to_i/1000000.0
-              return DV_Duration.new('P0Y0M0W0DT' + hour.to_s + 'H' +
+              return DvDuration.new('P0Y0M0W0DT' + hour.to_s + 'H' +
                         minute.to_s + 'M' +
                         second.to_s + fractional_second.to_s[1..-1] + 'S')
@@ -131,6 +131,6 @@
           end
 
-          class DV_Date_Time < DV_Temporal
-            include OpenEHR::Assumed_Library_Types::ISO8601_DATE_TIME_MODULE
+          class DvDateTime < DvTemporal
+            include OpenEhr::AssumedLibraryTypes::ISO8601_DATE_TIME_MODULE
             attr_reader :value
 
@@ -144,5 +144,5 @@
             def value=(value)              
               super(value)
-              iso8601date_time = Assumed_Library_Types::ISO8601_DATE_TIME.new(value)
+              iso8601date_time = AssumedLibraryTypes::ISO8601_DATE_TIME.new(value)
               self.year = iso8601date_time.year
               self.month = iso8601date_time.month
@@ -186,5 +186,5 @@
               fractional_second = ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
 
-              return DV_Duration.new(date_duration.value + 'T' + 
+              return DvDuration.new(date_duration.value + 'T' +
                         hour.to_s + 'H' +
                         minute.to_s + 'M' +
@@ -197,10 +197,10 @@
             def split_date_time(date_time)
               /^(.*)T(.*)$/ =~ date_time.as_string
-              return DV_Date.new($1), DV_Time.new($2)             
-            end
-          end
-
-          class DV_Duration < DV_Amount
-            include Assumed_Library_Types::ISO8601_DURATION_MODULE
+              return DvDate.new($1), DvTime.new($2)
+            end
+          end
+
+          class DvDuration < DvAmount
+            include AssumedLibraryTypes::ISO8601_DURATION_MODULE
             attr_reader :value
             
@@ -214,5 +214,5 @@
               raise ArgumentError, 'value must be not nil' if value.nil?
               @value = value
-              iso8601_duration = Assumed_Library_Types::ISO8601_DURATION.new(value)
+              iso8601_duration = AssumedLibraryTypes::ISO8601_DURATION.new(value)
               self.years = iso8601_duration.years
               self.months = iso8601_duration.months
@@ -234,5 +234,5 @@
 
           end
-        end # of Date_Time
+        end # of DateTime
       end # of Quantity
     end # of Data_Types
