diff --git a/README.txt b/README.txt
index 0426f8c..91a8339 100644
--- a/README.txt
+++ b/README.txt
@@ -1,36 +1,36 @@
 
-Field-collection
+Field collection
 -----------------
-Provides a field-collection field, to which any number of fields can be attached.
+Provides a field collection field, to which any number of fields can be attached.
 
-Each field-collection item is internally represented as an entity, which is
-referenced via the field-collection field in the host entity. While
-conceptually field-collections are treated as part of the host entity, each
-field-collection item may also be viewed and edited separately. 
+Each field collection item is internally represented as an entity, which is
+referenced via the field collection field in the host entity. While
+conceptually field collections are treated as part of the host entity, each
+field collection item may also be viewed and edited separately.
  
 
  Usage
  ------
  
-  * Add a field-collection field to any entity, e.g. to a node. For that use the
+  * Add a field collection field to any entity, e.g. to a node. For that use the
    the usual "Manage fields" interface provided by the "field ui" module of
    Drupal, e.g. "Admin -> Structure-> Content types -> Article -> Manage fields".
     
-  * Then go to "Admin -> Structure-> Field-collection" to define some fields for
-   the created field-collection.
+  * Then go to "Admin -> Structure-> Field collection" to define some fields for
+   the created field collection.
    
-  * By the default, the field-collection is not shown during editing of the host
-    entity. However, some links for adding, editing or deleting field-collection
+  * By the default, the field collection is not shown during editing of the host
+    entity. However, some links for adding, editing or deleting field collection
     items is shown when the host entity is viewed.
   
-  * Widgets for embedding the form for creating field-collections in the
-    host-entity can be provided by any module. In future the field-collection
+  * Widgets for embedding the form for creating field collections in the
+    host-entity can be provided by any module. In future the field collection
     module might provide such widgets itself too.
     
 
 Restrictions
 -------------
 
-  * As of now, the field-collection field does not properly respect different
+  * As of now, the field collection field does not properly respect different
     revisions or languages of the host entity. Thus, for now it is suggested to
     only use the field for entities that are not revisionable and translatable.
\ No newline at end of file
diff --git a/field-collection-item.tpl.php b/field-collection-item.tpl.php
index b14dd95..8d345cb 100644
--- a/field-collection-item.tpl.php
+++ b/field-collection-item.tpl.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Default theme implementation for field-collection items.
+ * Default theme implementation for field collection items.
  *
  * Available variables:
  * - $content: An array of comment items. Use render($content) to print them all, or
  *   print a subset such as render($content['field_example']). Use
  *   hide($content['field_example']) to temporarily suppress the printing of a
  *   given element.
- * - $title: The (sanitized) field-collection item label.
+ * - $title: The (sanitized) field collection item label.
  * - $url: Direct url of the current entity if specified.
  * - $page: Flag for the full page state.
  * - $classes: String of classes that can be used to style contextually through
diff --git a/field_collection.admin.inc b/field_collection.admin.inc
index 0800de7..b6328a4 100644
--- a/field_collection.admin.inc
+++ b/field_collection.admin.inc
@@ -36,7 +36,7 @@ function field_collections_overview() {
     $rows[$field_name]['data'][3] = l(t('manage display'), 'admin/structure/field-collections/' . $field_name_url_str . '/display');
   }
   if (empty($rows)) {
-    $output = t('No field-collections have been defined yet. To do so attach a field-collection field to any entity.');
+    $output = t('No field collections have been defined yet. To do so attach a field collection field to any entity.');
   }
   else {
     // Sort rows by field name.
diff --git a/field_collection.info b/field_collection.info
index 5b13563..39f62c2 100644
--- a/field_collection.info
+++ b/field_collection.info
@@ -1,5 +1,5 @@
 name = Field collection
-description = Provides a field-collection field, to which any number of fields can be attached.
+description = Provides a field collection field, to which any number of fields can be attached.
 core = 7.x
 dependencies[] = entity
 files[] = field_collection.test
diff --git a/field_collection.info.inc b/field_collection.info.inc
index fc35eec..03c961a 100644
--- a/field_collection.info.inc
+++ b/field_collection.info.inc
@@ -12,13 +12,13 @@ class FieldCollectionItemMetadataController extends EntityDefaultMetadataControl
     $properties = &$info['field_collection_item']['properties'];
 
     $properties['field_name']['label'] = t('Field name');
-    $properties['field_name']['description'] = t('The machine-readable name of the field-collection field containing this item.');
+    $properties['field_name']['description'] = t('The machine-readable name of the field collection field containing this item.');
     $properties['field_name']['required'] = TRUE;
 
     $properties['host_entity'] = array(
       'label' => t('Host entity'),
       'type' => 'entity',
-      'description' => t('The entity containing the field-collection field.'),
+      'description' => t('The entity containing the field collection field.'),
       'getter callback' => 'field_collection_item_get_host_entity',
       'setter callback' => 'field_collection_item_set_host_entity',
       'required' => TRUE,
diff --git a/field_collection.install b/field_collection.install
index 9ea62a3..5a2c40b 100644
--- a/field_collection.install
+++ b/field_collection.install
@@ -11,12 +11,12 @@
 function field_collection_schema() {
 
   $schema['field_collection_item'] = array(
-    'description' => 'Stores information about field-collection items.',
+    'description' => 'Stores information about field collection items.',
     'fields' => array(
       'item_id' => array(
         'type' => 'serial',
         'not null' => TRUE,
-        'description' => 'Primary Key: Unique field-collection item ID.',
+        'description' => 'Primary Key: Unique field collection item ID.',
       ),
       'field_name' => array(
         'description' => 'The name of the field on the host entity embedding this entity.',
diff --git a/field_collection.module b/field_collection.module
index 9da8350..f431447 100644
--- a/field_collection.module
+++ b/field_collection.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Module implementing field-collection field type.
+ * Module implementing field collection field type.
  */
 
 /**
@@ -13,7 +13,7 @@ function field_collection_help($path, $arg) {
     case 'admin/help#field_collection':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The field-collection module provides a field, to which any number of fields can be attached. See the <a href="@field-help">Field module help page</a> for more information about fields.', array('@field-help' => url('admin/help/field'))) . '</p>';
+      $output .= '<p>' . t('The field collection module provides a field, to which any number of fields can be attached. See the <a href="@field-help">Field module help page</a> for more information about fields.', array('@field-help' => url('admin/help/field'))) . '</p>';
       return $output;
   }
 }
@@ -23,7 +23,7 @@ function field_collection_help($path, $arg) {
  */
 function field_collection_entity_info() {
   $return['field_collection_item'] = array(
-    'label' => t('Field-collection item'),
+    'label' => t('Field collection item'),
     'label callback' => 'entity_class_label',
     'uri callback' => 'entity_class_uri',
     'entity class' => 'FieldCollectionItemEntity',
@@ -50,12 +50,12 @@ function field_collection_entity_info() {
   // to work.
   foreach (field_read_fields(array('type' => 'field_collection')) as $field_name => $field) {
     $return['field_collection_item']['bundles'][$field_name] = array(
-      'label' => t('Field-collection @field', array('@field' => $field_name)),
+      'label' => t('Field collection @field', array('@field' => $field_name)),
       'admin' => array(
         'path' => 'admin/structure/field-collections/%field_collection_field_name',
         'real path' => 'admin/structure/field-collections/' . strtr($field_name, array('_' => '-')),
         'bundle argument' => 3,
-        'access arguments' => array('administer field-collections'),
+        'access arguments' => array('administer field collections'),
       ),
     );
   }
@@ -74,10 +74,10 @@ function field_collection_field_name_load($arg) {
 }
 
 /**
- * Loads a field-collection item.
+ * Loads a field collection item.
  *
  * @return field_collection_item
- *   The field-collection item entity or FALSE.
+ *   The field collection item entity or FALSE.
  */
 function field_collection_item_load($item_id, $reset = FALSE) {
   $result = field_collection_item_load_multiple(array($item_id), array(), $reset);
@@ -85,10 +85,10 @@ function field_collection_item_load($item_id, $reset = FALSE) {
 }
 
 /**
- * Loads field-collection items.
+ * Loads field collection items.
  *
  * @return
- *   An array of field-collection item entities.
+ *   An array of field collection item entities.
  */
 function field_collection_item_load_multiple($ids = array(), $conditions = array(), $reset = FALSE) {
   return entity_load('field_collection_item', $ids, $conditions, $reset);
@@ -114,7 +114,7 @@ class FieldCollectionItemEntity extends Entity {
 
   /**
    * Provides info about the field on the host entity, which embeds this
-   * field-collection item.
+   * field collection item.
    */
   public function fieldInfo() {
     return field_info_field($this->field_name);
@@ -122,7 +122,7 @@ class FieldCollectionItemEntity extends Entity {
 
   /**
    * Provides info of the field instance containing the reference to this
-   * field-collection item.
+   * field collection item.
    */
   public function instanceInfo() {
     if ($this->fetchHostDetails()) {
@@ -147,7 +147,7 @@ class FieldCollectionItemEntity extends Entity {
         return t('New !instance_label', array('!instance_label' => $instance['label']));
       }
     }
-    return t('Unconnected field-collection item');
+    return t('Unconnected field collection item');
   }
 
   /**
@@ -191,12 +191,12 @@ class FieldCollectionItemEntity extends Entity {
       }
     }
     else {
-      throw new Exception('The host entity may be set only during creation of a field-collection item.');
+      throw new Exception('The host entity may be set only during creation of a field collection item.');
     }
   }
 
   /**
-   * Returns the host entity, which embeds this field-collection item.
+   * Returns the host entity, which embeds this field collection item.
    */
   public function hostEntity() {
     if ($this->fetchHostDetails()) {
@@ -210,7 +210,7 @@ class FieldCollectionItemEntity extends Entity {
 
   /**
    * Returns the entity type of the host entity, which embeds this
-   * field-collection item.
+   * field collection item.
    */
   public function hostEntityType() {
     if ($this->fetchHostDetails()) {
@@ -219,7 +219,7 @@ class FieldCollectionItemEntity extends Entity {
   }
 
   /**
-   * Returns the id of the host entity, which embeds this field-collection item.
+   * Returns the id of the host entity, which embeds this field collection item.
    */
   public function hostEntityId() {
     if ($this->fetchHostDetails()) {
@@ -228,7 +228,7 @@ class FieldCollectionItemEntity extends Entity {
   }
 
   /**
-   * Returns the bundle of the host entity, which embeds this field-collection
+   * Returns the bundle of the host entity, which embeds this field collection
    * item.
    */
   public function hostEntityBundle() {
@@ -241,7 +241,7 @@ class FieldCollectionItemEntity extends Entity {
   protected function fetchHostDetails() {
     if (!isset($this->hostEntityId)) {
       if ($this->item_id) {
-        // For saved field-collections, query the field data to determine the
+        // For saved field collections, query the field data to determine the
         // right host entity.
         $query = new EntityFieldQuery();
         $query->fieldCondition($this->fieldInfo(), 'value', $this->item_id);
@@ -258,7 +258,7 @@ class FieldCollectionItemEntity extends Entity {
   }
 
   /**
-   * Determines the $delta of the reference pointing to this field-collection
+   * Determines the $delta of the reference pointing to this field collection
    * item.
    */
   public function delta() {
@@ -277,12 +277,12 @@ class FieldCollectionItemEntity extends Entity {
   }
 
   /**
-   * Save the field-collection item.
+   * Save the field collection item.
    *
    * During creation a host entity has to be specified via the setHostEntity()
    * before this function is invoked. For the link between the entities to be
    * fully established, the host entity object is updated automatically to
-   * include a reference on this field-collection item durign saving.
+   * include a reference on this field collection item durign saving.
    *
    * @param $skip_host_save
    *   (internal) If TRUE is passed, the host entity is not saved automatically
@@ -293,7 +293,7 @@ class FieldCollectionItemEntity extends Entity {
     try {
       // Make sure we have a host entity during creation.
       if (!empty($this->is_new) && !(isset($this->hostEntityId) || isset($this->hostEntity))) {
-        throw new Exception("Unable to create a field-collection item without a given host entity.");
+        throw new Exception("Unable to create a field collection item without a given host entity.");
       }
       $is_new = !empty($this->is_new);
       $return = entity_get_controller($this->entityType)->save($this, $transaction);
@@ -324,7 +324,7 @@ class FieldCollectionItemEntity extends Entity {
   }
 
   /**
-   * Delete the field-collection item.
+   * Delete the field collection item.
    */
   public function delete() {
     parent::delete();
@@ -375,16 +375,16 @@ function field_collection_menu() {
   $items = array();
   if (module_exists('field_ui')) {
     $items['admin/structure/field-collections'] = array(
-      'title' => 'Field-collections',
-      'description' => 'Manage fields on field-collections.',
+      'title' => 'Field collections',
+      'description' => 'Manage fields on field collections.',
       'page callback' => 'field_collections_overview',
-      'access arguments' => array('administer field-collections'),
+      'access arguments' => array('administer field collections'),
       'type' => MENU_NORMAL_ITEM,
       'file' => 'field_collection.admin.inc',
     );
   }
 
-  // Add menu paths for viewing/editing/deleting field-collection items.
+  // Add menu paths for viewing/editing/deleting field collection items.
   foreach (field_info_fields() as $field) {
     if ($field['type'] == 'field_collection') {
       $path = field_collection_field_get_path($field);
@@ -436,7 +436,7 @@ function field_collection_menu() {
 }
 
 /**
- * Implements hook_menu_alter() to fix the field-collections admin UI tabs.
+ * Implements hook_menu_alter() to fix the field collections admin UI tabs.
  */
 function field_collection_menu_alter(&$items) {
   if (module_exists('field_ui') && isset($items['admin/structure/field-collections/%field_collection_field_name/fields'])) {
@@ -481,9 +481,9 @@ function field_collection_admin_paths() {
  */
 function field_collection_permission() {
   return array(
-    'administer field-collections' =>  array(
-      'title' => t('Administer field-collections'),
-      'description' => t('Create and delete fields on field-collections.'),
+    'administer field collections' =>  array(
+      'title' => t('Administer field collections'),
+      'description' => t('Create and delete fields on field collections.'),
     ),
   );
 }
@@ -502,7 +502,7 @@ function field_collection_permission() {
  *   Whether access is allowed or not.
  */
 function field_collection_item_access($op, FieldCollectionItemEntity $item = NULL, $account = NULL) {
-  if (user_access('administer field-collections', $account)) {
+  if (user_access('administer field collections', $account)) {
     return TRUE;
   }
   if (!isset($item)) {
@@ -535,7 +535,7 @@ function field_collection_theme() {
 function field_collection_field_info() {
   return array(
     'field_collection' => array(
-      'label' => t('Field-collection'),
+      'label' => t('Field collection'),
       'description' => t('This field stores references to embedded entities, which itself may contain any number of fields.'),
       'instance_settings' => array(),
       'default_widget' => 'hidden',
@@ -550,7 +550,7 @@ function field_collection_field_info() {
 }
 
 /**
- * Returns the base path to use for field-collection items.
+ * Returns the base path to use for field collection items.
  */
 function field_collection_field_get_path($field) {
   if (empty($field['settings']['path'])) {
@@ -562,8 +562,8 @@ function field_collection_field_get_path($field) {
 /**
  * Implements hook_field_presave().
  *
- * Support saving field-collection items in @code $item['entity'] @endcode. This
- * may be used to seamlessly create field-collection items during host-entity
+ * Support saving field collection items in @code $item['entity'] @endcode. This
+ * may be used to seamlessly create field collection items during host-entity
  * creation or to save changes to the host entity and its collections at once.
  */
 function field_collection_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
@@ -590,7 +590,7 @@ function field_collection_field_delete($entity_type, $entity, $field, $instance,
 }
 
 /**
- * Get an array of field-collection item IDs stored in the given field items.
+ * Get an array of field collection item IDs stored in the given field items.
  */
 function field_collection_field_item_to_ids($items) {
   $ids = array();
@@ -616,7 +616,7 @@ function field_collection_field_is_empty($item, $field) {
 }
 
 /**
- * Determines whether a field-collection item entity is empty based on the collection-fields.
+ * Determines whether a field collection item entity is empty based on the collection-fields.
  */
 function field_collection_item_is_empty(FieldCollectionItemEntity $item) {
   $instances = field_info_instances('field_collection_item', $item->field_name);
@@ -631,7 +631,7 @@ function field_collection_item_is_empty(FieldCollectionItemEntity $item) {
     foreach ($languages as $langcode) {
       if (!empty($item->{$field_name}[$langcode])) {
         // If at least one collection-field is not empty; the
-        // field-collection-item is not empty.
+        // field collection item is not empty.
         foreach ($item->{$field_name}[$langcode] as $field_item) {
           if (!module_invoke($field['module'], 'field_is_empty', $field_item, $field)) {
             return FALSE;
@@ -649,7 +649,7 @@ function field_collection_item_is_empty(FieldCollectionItemEntity $item) {
 function field_collection_field_formatter_info() {
   return array(
     'field_collection_list' => array(
-      'label' => t('List field-collection items'),
+      'label' => t('List field collection items'),
       'field types' => array('field_collection'),
       'settings' =>  array(
         'edit' => t('Edit'),
@@ -659,7 +659,7 @@ function field_collection_field_formatter_info() {
       ),
     ),
     'field_collection_view' => array(
-      'label' => t('View field-collection items'),
+      'label' => t('View field collection items'),
       'field types' => array('field_collection'),
       'settings' =>  array(
         'edit' => t('Edit'),
@@ -859,19 +859,19 @@ function field_collection_field_widget_form(&$form, &$form_state, $field, $insta
       return $element;
 
     case 'field_collection_embed':
-      // If the field-collection item form contains another field-collection,
+      // If the field collection item form contains another field collection,
       // we might ran into a recursive loop. Prevent that.
       if ($recursion++ > 3) {
-        drupal_set_message(t('The field-collection item form has not been embedded to avoid recursive loops.'), 'error');
+        drupal_set_message(t('The field collection item form has not been embedded to avoid recursive loops.'), 'error');
         return $element;
       }
       $field_parents = $element['#field_parents'];
       $field_name = $element['#field_name'];
       $language = $element['#language'];
 
-      // Nest the field-collection-item entity form in a dedicated parent space,
+      // Nest the field collection item entity form in a dedicated parent space,
       // by appending [field_name, langcode, delta] to the current parent space.
-      // That way the form values of the field-collection item are separated.
+      // That way the form values of the field collection item are separated.
       $parents = array_merge($field_parents, array($field_name, $language, $delta));
 
       $element += array(
@@ -902,7 +902,7 @@ function field_collection_field_widget_form(&$form, &$form_state, $field, $insta
 }
 
 /**
- * Gets a field-collection item entity for a given field item.
+ * Gets a field collection item entity for a given field item.
  *
  * @param $field_name
  *   (optional) If given and there is no entity yet, a new entity object is
@@ -922,12 +922,12 @@ function field_collection_field_get_entity(&$item, $field_name = NULL) {
 }
 
 /**
- * FAPI #after_build of an individual field-collection element to delay the validation of #required.
+ * FAPI #after_build of an individual field collection element to delay the validation of #required.
  */
 function field_collection_field_widget_embed_delay_required_validation(&$element, &$form_state) {
   // If the process_input flag is set, the form and its input is going to be
   // validated. Prevent #required (sub)fields from throwing errors while
-  // their non-#required field-collection item is empty.
+  // their non-#required field collection item is empty.
   if ($form_state['process_input']) {
     _field_collection_collect_required_elements($element, $element['#field_collection_required_elements']);
   }
@@ -958,7 +958,7 @@ function field_collection_field_widget_render_required($element) {
 }
 
 /**
- * FAPI validation of an individual field-collection element.
+ * FAPI validation of an individual field collection element.
  */
 function field_collection_field_widget_embed_validate($element, &$form_state, $complete_form) {
   $instance = field_widget_instance($element, $form_state);
@@ -1005,7 +1005,7 @@ function field_collection_field_widget_embed_validate($element, &$form_state, $c
       $item['_weight'] = $element['_weight']['#value'];
     }
 
-    // Put the field-collection item in $item['entity'], so it is saved with
+    // Put the field collection item in $item['entity'], so it is saved with
     // the host entity via hook_field_presave() / field API if it is not empty.
     // @see field_collection_field_presave()
     $item['entity'] = $field_collection_item;
@@ -1031,7 +1031,7 @@ function field_collection_field_create_field($field) {
  */
 function field_collection_field_delete_field($field) {
   if ($field['type'] == 'field_collection') {
-    // Notify field.module that field-collection was deleted.
+    // Notify field.module that field collection was deleted.
     field_attach_delete_bundle('field_collection_item', $field['field_name']);
 
     // Clear caches.
@@ -1054,7 +1054,7 @@ function field_collection_views_api() {
  * Implements hook_features_pipe_component_alter() for fields.
  */
 function field_collection_features_pipe_field_alter(&$pipe, $data, $export) {
-  // Add the fields of the field-collection entity to the pipe.
+  // Add the fields of the field collection entity to the pipe.
   foreach ($data as $identifier) {
     if (($field = features_field_load($identifier)) && $field['field_config']['type'] == 'field_collection') {
       $fields = field_info_instances('field_collection_item', $field['field_config']['field_name']);
@@ -1085,10 +1085,10 @@ function field_collection_entity_metadata_property_callback(&$info, $entity_type
  */
 function field_collection_item_set_host_entity($item, $property_name, $wrapper) {
   if (empty($item->is_new)) {
-    throw new EntityMetadataWrapperException('The host entity may be set only during creation of a field-collection item.');
+    throw new EntityMetadataWrapperException('The host entity may be set only during creation of a field collection item.');
   }
   if (!isset($wrapper->{$item->field_name})) {
-    throw new EntityMetadataWrapperException('The specified entity has no such field-collection field.');
+    throw new EntityMetadataWrapperException('The specified entity has no such field collection field.');
   }
   $item->setHostEntity($wrapper->type(), $wrapper->value());
 }
@@ -1102,7 +1102,7 @@ function field_collection_item_get_host_entity($item) {
 }
 
 /**
- * Entity property info getter callback for the field-collection items.
+ * Entity property info getter callback for the field collection items.
  *
  * Like entity_metadata_field_property_get(), but additionally supports getting
  * not-yet saved collection items from @code $item['entity'] @endcode.
diff --git a/field_collection.pages.inc b/field_collection.pages.inc
index 22833c5..52c1f48 100644
--- a/field_collection.pages.inc
+++ b/field_collection.pages.inc
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Provides the field-collection item view / edit / delete pages.
+ * Provides the field collection item view / edit / delete pages.
  */
 
 // TODO: fix being embedded in a host with revisions.
 
 /**
- * Field-collection item view page.
+ * Field collection item view page.
  */
 function field_collection_item_page_view($field_collection_item) {
   // @todo: Set breadcrumb including the host.
@@ -17,7 +17,7 @@ function field_collection_item_page_view($field_collection_item) {
 }
 
 /**
- * Form for editing a field-collection item.
+ * Form for editing a field collection item.
  * @todo implement hook_forms().
  */
 function field_collection_item_form($form, &$form_state, $field_collection_item) {
@@ -67,7 +67,7 @@ function field_collection_item_form_submit($form, &$form_state) {
 }
 
 /**
- * Form for deleting a field-collection item.
+ * Form for deleting a field collection item.
  */
 function field_collection_item_delete_confirm($form, &$form_state, $field_collection_item) {
   $form_state += array('field_collection_item' => $field_collection_item);
@@ -81,7 +81,7 @@ function field_collection_item_delete_confirm($form, &$form_state, $field_collec
 }
 
 /**
- * Submit callback for deleting a field-collection item.
+ * Submit callback for deleting a field collection item.
  */
 function field_collection_item_delete_confirm_submit($form, &$form_state) {
   $field_collection_item = $form_state['field_collection_item'];
@@ -91,7 +91,7 @@ function field_collection_item_delete_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Add a new field-collection item.
+ * Add a new field collection item.
  *
  * @todo: Support optionally passing in the revision_id and langcode parameters.
  */
@@ -124,8 +124,8 @@ function field_collection_item_add($field_name, $entity_type, $entity_id, $revis
   drupal_set_title($title);
 
   $field_collection_item = entity_create('field_collection_item', array('field_name' => $field_name));
-  // Do not link the field-collection item with the host entity at this point,
-  // as during the form-workflow we have multiple field-collection item entity
+  // Do not link the field collection item with the host entity at this point,
+  // as during the form-workflow we have multiple field collection item entity
   // instances, which we don't want link all with the host.
   // That way the link is going to be created when the item is saved.
   $field_collection_item->setHostEntity($entity_type, $entity, LANGUAGE_NONE, FALSE);
diff --git a/field_collection.test b/field_collection.test
index cc6d797..4b5ced4 100644
--- a/field_collection.test
+++ b/field_collection.test
@@ -13,7 +13,7 @@ class FieldCollectionBasicTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Field collection',
-      'description' => 'Tests creating and using field-collections.',
+      'description' => 'Tests creating and using field collections.',
       'group' => 'Field types',
     );
   }
@@ -81,7 +81,7 @@ class FieldCollectionBasicTestCase extends DrupalWebTestCase {
     node_delete($node->nid);
     $this->assertTrue(node_load($node->nid, NULL, TRUE) == FALSE, 'Node without collection values deleted.');
 
-    // Test creating a field-collection entity with a not-yet saved host entity.
+    // Test creating a field collection entity with a not-yet saved host entity.
     $node = entity_create('node', array('type' => 'article'));
     $entity = entity_create('field_collection_item', array('field_name' => $this->field_name));
     $entity->setHostEntity('node', $node);
@@ -91,7 +91,7 @@ class FieldCollectionBasicTestCase extends DrupalWebTestCase {
     $this->assertTrue(!empty($node->nid), 'Node has been saved with the collection.');
     $this->assertTrue(count($node->{$this->field_name}[LANGUAGE_NONE]) == 1 && !empty($node->{$this->field_name}[LANGUAGE_NONE][0]['value']), 'Link has been established.');
 
-    // Again, test creating a field-collection with a not-yet saved host entity,
+    // Again, test creating a field collection with a not-yet saved host entity,
     // but this time save both entities via the host.
     $node = entity_create('node', array('type' => 'article'));
     $entity = entity_create('field_collection_item', array('field_name' => $this->field_name));
@@ -171,14 +171,14 @@ class FieldCollectionBasicTestCase extends DrupalWebTestCase {
 
 
 /**
- * Test using field-collection with Rules.
+ * Test using field collection with Rules.
  */
 class FieldCollectionRulesIntegrationTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
       'name' => 'Field collection Rules integration',
-      'description' => 'Tests using field-collections with rules.',
+      'description' => 'Tests using field collections with rules.',
       'group' => 'Field types',
       'dependencies' => array('rules'),
     );
@@ -252,13 +252,13 @@ class FieldCollectionRulesIntegrationTestCase extends DrupalWebTestCase {
     $this->assertTrue(!empty($node->{$this->field_name}[LANGUAGE_NONE][0]['value']), 'A field_collection has been successfully created.');
     $item_id = $node->{$this->field_name}[LANGUAGE_NONE][0]['value'];
 
-    // Now try making use of the field-collection in rules.
+    // Now try making use of the field collection in rules.
     $action_set = rules_action_set(array('node' => array('type' => 'node', 'bundle' => 'article')));
     $action_set->action('drupal_message', array('message:select' => 'node:field-test-collection:0:field-text'));
     $action_set->execute($node);
 
     $msg = drupal_get_messages();
-    $this->assertEqual(array_pop($msg['status']), 'foo', 'Field-collection can be used.');
+    $this->assertEqual(array_pop($msg['status']), 'foo', 'Field collection can be used.');
     RulesLog::logger()->checkLog();
   }
 
@@ -266,25 +266,25 @@ class FieldCollectionRulesIntegrationTestCase extends DrupalWebTestCase {
    * Test using field collection items via the host while they are being created.
    */
   function testUsageDuringCreation() {
-    // Test using a single-cardinality field-collection.
+    // Test using a single-cardinality field collection.
     $this->createFields(1);
 
     $node = $this->drupalCreateNode(array('type' => 'article'));
     $entity = entity_create('field_collection_item', array('field_name' => $this->field_name));
     $entity->setHostEntity('node', $node);
-    // Now the field-collection is linked to the host, but not yet saved.
+    // Now the field collection is linked to the host, but not yet saved.
 
     // Test using the wrapper on it.
     $wrapper = entity_metadata_wrapper('node', $node);
     $wrapper->get($this->field_name)->field_text->set('foo');
-    $this->assertEqual($entity->field_text[LANGUAGE_NONE][0]['value'], 'foo', 'Field-collection item used during creation via the wrapper.');
+    $this->assertEqual($entity->field_text[LANGUAGE_NONE][0]['value'], 'foo', 'Field collection item used during creation via the wrapper.');
 
     // Now test it via Rules, which should save our changes.
     $set = rules_action_set(array('node' => array('type' => 'node', 'bundle' => 'article')));
     $set->action('data_set', array('data:select' => 'node:' . $this->field_name . ':field-text', 'value' => 'bar'));
     $set->execute($node);
-    $this->assertEqual($entity->field_text[LANGUAGE_NONE][0]['value'], 'bar', 'Field-collection item used during creation via Rules.');
-    $this->assertTrue(!empty($entity->item_id), 'Field-collection item has been saved by Rules and the host entity.');
+    $this->assertEqual($entity->field_text[LANGUAGE_NONE][0]['value'], 'bar', 'Field collection item used during creation via Rules.');
+    $this->assertTrue(!empty($entity->item_id), 'Field collection item has been saved by Rules and the host entity.');
     RulesLog::logger()->checkLog();
   }
 }
diff --git a/views/field_collection.views.inc b/views/field_collection.views.inc
index 0cf190d..b2505f4 100644
--- a/views/field_collection.views.inc
+++ b/views/field_collection.views.inc
@@ -3,7 +3,7 @@
 /**
  * Implements hook_field_views_data().
  *
- * Views integration for field-collection fields. Adds a relationship to the
+ * Views integration for field collection fields. Adds a relationship to the
  * default field data.
  *
  * @see field_views_field_default_views_data()
@@ -19,7 +19,7 @@ function field_collection_field_views_data($field) {
           'handler' => 'views_handler_relationship',
           'base' => 'field_collection_item',
           'base field' => 'item_id',
-          'label' => t('field-collection item from !field_name', array('!field_name' => $field['field_name'])),
+          'label' => t('field collection item from !field_name', array('!field_name' => $field['field_name'])),
         );
       }
     }