diff --git a/lib/myob-api.rb b/lib/myob-api.rb
index e2b85cb..54d461c 100644
--- a/lib/myob-api.rb
+++ b/lib/myob-api.rb
@@ -17,7 +17,7 @@
 require 'myob/api/models/employee_payroll_advice'
 
 require 'myob/api/models/invoice'
-require 'myob/api/models/invoice_item'
+require 'myob/api/models/item_invoice'
 
 require 'myob/api/models/payroll_category'
 require 'myob/api/models/wage'
diff --git a/lib/myob/api/client.rb b/lib/myob/api/client.rb
index d6b447c..2cac329 100644
--- a/lib/myob/api/client.rb
+++ b/lib/myob/api/client.rb
@@ -9,7 +9,9 @@ class Client
       attr_reader :current_company_file, :client
 
       def initialize(options)
-        Myob::Api::Model::Base.subclasses.each {|c| model(c.name.split("::").last)}
+        Myob::Api::Model::Base.descendants.each do |klass|
+          model klass.name.split("::").last
+        end
 
         @redirect_uri         = options[:redirect_uri]
         @consumer             = options[:consumer]
diff --git a/lib/myob/api/models/invoice_item.rb b/lib/myob/api/models/item_invoice.rb
similarity index 61%
rename from lib/myob/api/models/invoice_item.rb
rename to lib/myob/api/models/item_invoice.rb
index 3b9081a..7c63454 100644
--- a/lib/myob/api/models/invoice_item.rb
+++ b/lib/myob/api/models/item_invoice.rb
@@ -1,11 +1,14 @@
 module Myob
   module Api
     module Model
-      class InvoiceItem < Base
+      class ItemInvoice < Base
         def model_route
           'Sale/Invoice/Item'
         end
       end
+
+      class InvoiceItem < ItemInvoice
+      end
     end
   end
-end
\ No newline at end of file
+end