diff --git a/lib/fit4ruby/FieldDescription.rb b/lib/fit4ruby/FieldDescription.rb
index fe946e3..aa6c5e0 100644
--- a/lib/fit4ruby/FieldDescription.rb
+++ b/lib/fit4ruby/FieldDescription.rb
@@ -38,11 +38,18 @@ def full_field_name(developer_data_ids)
          return
       end
 
-      app_id = developer_data_ids[@developer_data_index].application_id
-      # Convert the byte array with the app ID into a 16 character hex string.
-      app_id_str = app_id.map { |i| '%02X' % i }.join('')
-      @full_field_name =
-        "#{@field_name.gsub(/[^A-Za-z0-9_]/, '_')}_#{app_id_str}"
+      if (app_id = developer_data_ids[@developer_data_index].application_id)
+        # Convert the byte array with the app ID into a 16 character hex string.
+        id_str = app_id.map { |i| '%02X' % i }.join('')
+        @full_field_name =
+            "#{@field_name.gsub(/[^A-Za-z0-9_]/, '_')}_#{id_str}"
+      elsif (manf_id = developer_data_ids[@developer_data_index].manufacturer_id)
+        id_str = '%02X' % manf_id
+        @full_field_name = @field_name
+      else
+        id_str = ""
+        @full_field_name = @field_name
+      end
     end
 
     def create_global_definition(fit_entity)
@@ -78,4 +85,3 @@ def create_global_definition(fit_entity)
   end
 
 end
-
diff --git a/lib/fit4ruby/FitMessageRecord.rb b/lib/fit4ruby/FitMessageRecord.rb
index cdc3601..ef8cf77 100644
--- a/lib/fit4ruby/FitMessageRecord.rb
+++ b/lib/fit4ruby/FitMessageRecord.rb
@@ -111,7 +111,7 @@ def read(io, entity, filter = nil, fields_dump = nil, fit_entity)
           next
         end
 
-        field_name = field_description.full_field_name(fit_entity)
+        field_name = field_description.full_field_name(fit_entity.top_level_record.developer_data_ids)
         units = field_description.units
         type = field.type
         native_message_number = field_description.native_mesg_num
@@ -205,4 +205,3 @@ def produce(definition)
   end
 
 end
-