diff --git a/fivestar.module b/fivestar.module
index 418b7a9..f9f643b 100644
--- a/fivestar.module
+++ b/fivestar.module
@@ -47,6 +47,25 @@ function fivestar_menu() {
 }
 
 /**
+ * Implements hook_microdata_suggestions().
+ */
+function fivestar_microdata_suggestions() {
+  $mappings = array();
+
+  // Add the review mapping for Schema.org
+  $mappings['fields']['fivestar']['schema.org'] = array(
+    '#itemprop' => array('aggregate'),
+    '#is_item' => TRUE,
+    '#itemtype' => array('http://schema.org/AggregateRating'),
+    'average_rating' => array(
+      '#itemprop' => array('ratingValue'),
+    ),
+  );
+
+  return $mappings;
+}
+
+/**
  * Implementation of hook_permission().
  *
  * Exposes permissions for rating content.
diff --git a/includes/fivestar.field.inc b/includes/fivestar.field.inc
index 38f37ed..3b74941 100644
--- a/includes/fivestar.field.inc
+++ b/includes/fivestar.field.inc
@@ -702,8 +702,8 @@ function fivestar_field_prepare_view($entity_type, $entities, $field, $instances
 /**
  * Implements hook_microdata_value_type_alter().
  */
-function fivestar_microdata_value_type_alter(&$types) {
-  $types['fivestar'] = 'item';
+function fivestar_microdata_value_types_alter(&$types) {
+  $types['fivestar'] = 'item_option';
 }
 
 /**
diff --git a/includes/fivestar.microdata.inc b/includes/fivestar.microdata.inc
deleted file mode 100644
index bc1c734..0000000
--- a/includes/fivestar.microdata.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides integration with microdata module.
- *
- * Note that some integration takes place in hook_field_info and in field
- * formatters.
- */
-
-/**
- * Implements hook_microdata_suggestions().
- */
-function fivestar_microdata_suggestions() {
-  $mappings = array();
-
-  // Add the review mapping for Schema.org
-  $mappings['fields']['fivestar']['schema.org'] = array(
-    '#itemprop' => array('aggregateRating'),
-    '#itemtype' => array('http://schema.org/AggregateRating'),
-    'average_rating' => array(
-      '#itemprop' => array('ratingValue'),
-    ),
-  );
-
-  return $mappings;
-}