Index: ruby/branches/0.5.0/lib/open_ehr/rm/data_types/quantity.rb
===================================================================
--- ruby/branches/0.5.0/lib/open_ehr/rm/data_types/quantity.rb	(revision 165)
+++ ruby/branches/0.5.0/lib/open_ehr/rm/data_types/quantity.rb	(revision 167)
@@ -3,12 +3,12 @@
 # Ticket refs #50
 require 'assumed_library_types'
-module OpenEHR
+module OpenEhr
   module RM
-    module Data_Types
+    module DataTypes
       module Quantity
 
         autoload :Date_Time, "rm/data_types/quantity/date_time.rb"
 
-        class DV_Ordered < OpenEHR::RM::Data_Types::Basic::Data_Value
+        class DvOrdered < OpenEhr::RM::DataTypes::Basic::DataValue
           include Comparable
           attr_accessor :normal_range, :other_refference_ranges, :normal_status
@@ -51,9 +51,9 @@
         end
 
-        class DV_Interval < OpenEHR::Assumed_Library_Types::Interval
-
-        end
-
-        class DV_Quantified < DV_Ordered
+        class DvInterval < OpenEhr::AssumedLibraryTypes::Interval
+
+        end
+
+        class DvQuantified < DvOrdered
           attr_reader :magnitude, :magnitude_status
 
@@ -78,5 +78,5 @@
             if magnitude_status.nil?
               @magnitude_status = '='
-            elsif DV_Quantified.valid_magnitude_status?(magnitude_status)
+            elsif DvQuantified.valid_magnitude_status?(magnitude_status)
               @magnitude_status = magnitude_status
             else
@@ -99,5 +99,5 @@
         end
 
-        class DV_Ordinal < DV_Ordered
+        class DvOrdinal < DvOrdered
           attr_reader :value, :symbol, :limits
 
@@ -121,5 +121,5 @@
 
           def is_strictly_comparable_to?(others)
-            unless others.instance_of? OpenEHR::RM::Data_Types::Quantity::DV_Ordinal
+            unless others.instance_of? OpenEhr::RM::DataTypes::Quantity::DvOrdinal
               return false
             end
@@ -144,5 +144,5 @@
         end
 
-        class DV_Absolute_Quantity < DV_Quantified
+        class DvAbsoluteQuantity < DvQuantified
           attr_accessor :accuracy
 
@@ -168,5 +168,5 @@
         end
 
-        class DV_Amount < DV_Quantified
+        class DvAmount < DvQuantified
           attr_reader :accuracy, :accuracy_percent
           def initialize(magnitude, magnitude_status=nil, accuracy=nil,
@@ -186,5 +186,5 @@
               raise ArgumentError, 'type mismatch'
             end
-            return DV_Amount.new(@magnitude+other.magnitude, @magnitude_status,
+            return DvAmount.new(@magnitude+other.magnitude, @magnitude_status,
                                  @accuracy, @accuracy_percent, @normal_range,
                                  @normal_status, @other_reference_ranges)
@@ -210,5 +210,5 @@
         end
 
-        class DV_Quantity < DV_Amount
+        class DvQuantity < DvAmount
           attr_reader :units, :precision
           def initialize(magnitude, units, magnitude_status=nil, precision=nil,
@@ -235,5 +235,5 @@
           def is_strictly_comparable_to?(others)
             return false if others.nil?
-            if others.instance_of?(DV_Quantity) && others.units == @units
+            if others.instance_of?(DvQuantity) && others.units == @units
               return true
             else
@@ -252,5 +252,5 @@
           def +(other)
             dv_amount = super(other)
-            return DV_Quantity.new(dv_amount.magnitude, @units,
+            return DvQuantity.new(dv_amount.magnitude, @units,
                                    @magnitude_status, @precision,
                                    @accuracy, @accuracy_percent, @normal_range,
@@ -259,8 +259,8 @@
         end
 
-        class DV_Count < DV_Amount
+        class DvCount < DvAmount
           def is_strictly_comparable_to?(others)
             return false if others.nil?
-            if others.instance_of?(DV_Count)
+            if others.instance_of?(DvCount)
               return true
             else
@@ -270,5 +270,5 @@
         end
 
-        class Reference_Range
+        class ReferenceRange
           attr_reader :meaning, :range
 
@@ -297,5 +297,5 @@
         end
 
-        module Proportion_Kind
+        module ProportionKind
           PK_RATIO = 0
           PK_UNITARY = 1
@@ -304,12 +304,12 @@
           PK_INTEGER_FRACTION = 4
 
-          def Proportion_Kind.valid_proportion_kind?(kind)
+          def ProportionKind.valid_proportion_kind?(kind)
             return true if kind >= 0 && kind <= 4
             return false
           end
-        end # end of Proportion_Kind
-
-        class DV_Proportion < DV_Amount
-          include Proportion_Kind
+        end # end of ProportionKind
+
+        class DvProportion < DvAmount
+          include ProportionKind
           attr_reader :numerator, :denominator, :type, :precision
 
@@ -360,5 +360,5 @@
 
           def type=(type)
-            if Proportion_Kind.valid_proportion_kind?(type)
+            if ProportionKind.valid_proportion_kind?(type)
               @type = type
             else
@@ -386,5 +386,5 @@
 
           def is_strictly_comparable_to?(other)
-            unless other.instance_of?(DV_Proportion)
+            unless other.instance_of?(DvProportion)
               return false
             end
@@ -395,6 +395,5 @@
             end
           end
-        end # end of DV_Proportion
-
+        end # end of DvProportion
       end # of Quantity
     end # of Data_Types
