diff --git a/Gemfile b/Gemfile
index 07be334..6fc4828 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ gemspec
 
 gem 'rake'
 gem 'pry'
-gem 'fhir_models', '~> 1.6'
 
 group :test do
   gem 'simplecov', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index d9aa236..c5d1fd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    fhir_scorecard (1.0.1)
-      fhir_models
+    fhir_scorecard (1.8.0)
+      fhir_models (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +15,7 @@ GEM
     coderay (1.1.1)
     date_time_precision (0.8.1)
     docile (1.1.5)
-    fhir_models (1.6.8)
+    fhir_models (1.8.1)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 1.16, < 3)
@@ -51,7 +51,6 @@ PLATFORMS
 
 DEPENDENCIES
   awesome_print
-  fhir_models (~> 1.6)
   fhir_scorecard!
   minitest (~> 5.3)
   minitest-reporters
diff --git a/fhir_scorecard.gemspec b/fhir_scorecard.gemspec
index f8e01b0..f54b5bd 100644
--- a/fhir_scorecard.gemspec
+++ b/fhir_scorecard.gemspec
@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.email = "jwalonoski@mitre.org"
   s.homepage = "https://github.com/fhir-crucible/fhir_scorecard"
   s.authors = ["Jason Walonoski"]
-  s.version = '1.0.1'
+  s.version = '1.8.0'
 
   s.files = s.files = `git ls-files`.split("\n")
 
-  s.add_runtime_dependency 'fhir_models'
+  s.add_runtime_dependency 'fhir_models', '~> 1.8'
 end
diff --git a/lib/rubrics/completeness.rb b/lib/rubrics/completeness.rb
index dce739e..5266c58 100644
--- a/lib/rubrics/completeness.rb
+++ b/lib/rubrics/completeness.rb
@@ -12,7 +12,7 @@ class Completeness < FHIR::Rubrics
       'QuestionnaireResponse','Coverage'
     ]
 
-    MEDICATIONS = [ 'MedicationStatement','MedicationDispense','MedicationAdministration','MedicationOrder' ]
+    MEDICATIONS = [ 'MedicationStatement','MedicationDispense','MedicationAdministration','MedicationRequest' ]
 
     # A Patient Record is not complete without certain required items and medications.
     rubric :completeness do |record|
diff --git a/lib/rubrics/cvx_meds.rb b/lib/rubrics/cvx_meds.rb
index 4cd73e2..6813413 100644
--- a/lib/rubrics/cvx_meds.rb
+++ b/lib/rubrics/cvx_meds.rb
@@ -10,7 +10,7 @@ class CVXMeds < FHIR::Rubrics
       # Medication.code (CodeableConcept)
       # MedicationAdministration.medicationCodeableConcept / medicationReference
       # MedicationDispense.medicationCodeableConcept / medicationReference
-      # MedicationOrder.medicationCodeableConcept / medicationReference
+      # MedicationRequest.medicationCodeableConcept / medicationReference
       # MedicationStatement.medicationCodeableConcept / medicationReference
 
       resources = record.entry.map{|e|e.resource}
@@ -19,7 +19,7 @@ class CVXMeds < FHIR::Rubrics
             results[:eligible_fields] += 1
             results[:validated_fields] += 1 if cvx?(resource.code)        
         elsif (
-            resource.is_a?(FHIR::MedicationOrder) ||
+            resource.is_a?(FHIR::MedicationRequest) ||
             resource.is_a?(FHIR::MedicationDispense) ||
             resource.is_a?(FHIR::MedicationAdministration) ||
             resource.is_a?(FHIR::MedicationStatement) )
diff --git a/lib/rubrics/quantities_ucum.rb b/lib/rubrics/quantities_ucum.rb
index 1783219..18e9b3f 100644
--- a/lib/rubrics/quantities_ucum.rb
+++ b/lib/rubrics/quantities_ucum.rb
@@ -8,7 +8,7 @@ class QuantitiesUcum < FHIR::Rubrics
 
     CHECK = [
       'VisionPrescription','SupplyDelivery','Substance','Specimen','Sequence','Observation','NutritionRequest',
-      'MedicationStatement','MedicationOrder','MedicationDispense','MedicationAdministration','Medication','Immunization','CarePlan'
+      'MedicationStatement','MedicationRequest','MedicationDispense','MedicationAdministration','Medication','Immunization','CarePlan'
     ]
 
     # Physical quantities should use UCUM
diff --git a/lib/rubrics/rxnorm_meds.rb b/lib/rubrics/rxnorm_meds.rb
index d0310dd..b2af909 100644
--- a/lib/rubrics/rxnorm_meds.rb
+++ b/lib/rubrics/rxnorm_meds.rb
@@ -10,7 +10,7 @@ class RxNormMeds < FHIR::Rubrics
       # Medication.code (CodeableConcept)
       # MedicationAdministration.medicationCodeableConcept / medicationReference
       # MedicationDispense.medicationCodeableConcept / medicationReference
-      # MedicationOrder.medicationCodeableConcept / medicationReference
+      # MedicationRequest.medicationCodeableConcept / medicationReference
       # MedicationStatement.medicationCodeableConcept / medicationReference
 
       resources = record.entry.map{|e|e.resource}
@@ -19,7 +19,7 @@ class RxNormMeds < FHIR::Rubrics
             results[:eligible_fields] += 1
             results[:validated_fields] += 1 if rxnorm?(resource.code)        
         elsif (
-            resource.is_a?(FHIR::MedicationOrder) ||
+            resource.is_a?(FHIR::MedicationRequest) ||
             resource.is_a?(FHIR::MedicationDispense) ||
             resource.is_a?(FHIR::MedicationAdministration) ||
             resource.is_a?(FHIR::MedicationStatement) )