diff --git a/.gitignore b/.gitignore
index 3e2bceea5..85ae0c6ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ report.txt
 .tmp
 src/assets/css/tainacan-embeds.css
 src/assets/css/tainacan-embeds.css.map
+demosaved.csv
diff --git a/docs/class-reference-fields.md b/docs/class-reference-fields.md
index d5be6dbdd..32e3f3437 100644
--- a/docs/class-reference-fields.md
+++ b/docs/class-reference-fields.md
@@ -1,16 +1,16 @@
-# Fields
+# Metadata
 
-## Field Repository
+## Metadatum Repository
 
-<!-- BEGIN DOC-COMMENT H3 src/classes/repositories/class-tainacan-fields.php -->
-### `class Fields extends Repository`
+<!-- BEGIN DOC-COMMENT H3 src/classes/repositories/class-tainacan-metadata.php -->
+### `class Metadata extends Repository`
 
-Class Fields 
+Class Metadata 
 
 
 ### `protected function __construct()`
 
-Register specific hooks for field repository 
+Register specific hooks for metadatum repository 
 
 
 ### `public function get_cpt_labels()`
@@ -20,14 +20,14 @@ Get the labels for the custom post type of this repository
 
 ### `public function get_default_metadata_attribute()`
 
-constant used in default field in attribute collection_id 
+constant used in default metadatum in attribute collection_id 
 
 
 **Returns:** `string` — the value of constant
 
 ### `public function register_field_type( $class_name )`
 
-register field types class on array of types 
+register metadatum types class on array of types 
 
 
 **Parameters:**
@@ -36,7 +36,7 @@ register field types class on array of types
 
 ### `public function unregister_field_type( $class_name )`
 
-register field types class on array of types 
+register metadatum types class on array of types 
 
 
 **Parameters:**
@@ -45,21 +45,21 @@ register field types class on array of types
 
 ### `public function fetch( $args, $output = null )`
 
-fetch field based on ID or WP_Query args 
+fetch metadatum based on ID or WP_Query args 
 
-field are stored as posts. Check WP_Query docs to learn all args accepted in the $args parameter (@see https://developer.wordpress.org/reference/classes/wp_query/) You can also use a mapped property, such as name and description, as an argument and it will be mapped to the appropriate WP_Query argument 
+metadatum are stored as posts. Check WP_Query docs to learn all args accepted in the $args parameter (@see https://developer.wordpress.org/reference/classes/wp_query/) You can also use a mapped property, such as name and description, as an argument and it will be mapped to the appropriate WP_Query argument 
 
 
 **Parameters:**
 
-* `$args` — array — WP_Query args || int $args the field id
+* `$args` — array — WP_Query args || int $args the metadatum id
 * `$output` — string — The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
 
-**Returns:** `Entities\Field|\WP_Query|Array` — an instance of wp query OR array of entities;
+**Returns:** `Entities\Metadatum|\WP_Query|Array` — an instance of wp query OR array of entities;
 
 ### `public function fetch_by_collection(Entities\Collection $collection, $args = [], $output = null)`
 
-fetch field by collection, searches all field available 
+fetch metadatum by collection, searches all metadatum available 
 
 
 **Parameters:**
@@ -68,11 +68,11 @@ fetch field by collection, searches all field available
 * `$args` — array — WP_Query args plus disabled_fields
 * `$output` — string — The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
 
-**Returns:** `array` — Entities\Field
+**Returns:** `array` — Entities\Metadatum
 
 ### `public function order_result( $result, Entities\Collection $collection, $include_disabled = false )`
 
-Ordinate the result from fetch response if $collection has an ordination, fields not ordinated appear on the end of the list 
+Ordinate the result from fetch response if $collection has an ordination, metadata not ordinated appear on the end of the list 
 
 
 
@@ -81,18 +81,18 @@ Ordinate the result from fetch response if $collection has an ordination, fields
 
 * `Response` — $result — from method fetch
 * `$collection` — Entities\Collection
-* `$include_disabled` — bool — Wether to include disabled fields in the results or not
+* `$include_disabled` — bool — Wether to include disabled metadata in the results or not
 
 **Returns:** `array` — or WP_Query ordinate
 
-### `public function insert($field)`
+### `public function insert($metadatum)`
 
 {@inheritDoc} 
 **Parameters:**
 
-* `$field` — \Tainacan\Entities\Field
+* `$metadatum` — \Tainacan\Entities\Metadatum
 
-**Returns:** \Tainacan\Entities\Field
+**Returns:** \Tainacan\Entities\Metadatum
 
 ### `public function update($object, $new_values = null)`
 
@@ -101,16 +101,16 @@ Ordinate the result from fetch response if $collection has an ordination, fields
 
 ### `public function fetch_field_types( $output = 'CLASS')`
 
-fetch all registered field type classes 
+fetch all registered metadatum type classes 
 
-Possible outputs are: CLASS (default) - returns the Class name of of field types registered NAME - return an Array of the names of field types registered 
+Possible outputs are: CLASS (default) - returns the Class name of of metadatum types registered NAME - return an Array of the names of metadatum types registered 
 
 
 **Parameters:**
 
 * `string` — $output — CLASS | NAME
 
-**Returns:** `array` — of Entities\Field_Types\Field_Type classes path name
+**Returns:** `array` — of Entities\Metadatum_Types\Metadatum_Type classes path name
 
 ### `public function register_core_fields( Entities\Collection $collection )`
 
@@ -123,7 +123,7 @@ Possible outputs are: CLASS (default) - returns the Class name of of field types
 
 ### `public function disable_delete_core_fields( $before, $post )`
 
-block user from remove core fields 
+block user from remove core metadata 
 
 
 **Parameters:**
@@ -135,7 +135,7 @@ block user from remove core fields
 
 ### `public function force_delete_core_fields( $before, $post, $force_delete )`
 
-block user from remove core fields ( if use wp_delete_post) 
+block user from remove core metadata ( if use wp_delete_post) 
 
 
 **Parameters:**
@@ -159,72 +159,72 @@ returns all core items from a specific collection
 
 ### `public function insert_array_field( $data )`
 
-create a field entity and insert by an associative array ( attribute => value ) 
+create a metadatum entity and insert by an associative array ( attribute => value ) 
 
 
 **Parameters:**
 
-* `$data` — Array — the array of attributes to insert a field
+* `$data` — Array — the array of attributes to insert a metadatum
 
-**Returns:** `int` — the field id inserted
+**Returns:** `int` — the metadatum id inserted
 
-### `public function fetch_all_field_values($collection_id, $field_id)`
+### `public function fetch_all_field_values($collection_id, $metadatum_id)`
 
-Fetch all values of a field from a collection in all it collection items 
+Fetch all values of a metadatum from a collection in all it collection items 
 
 
 **Returns:** array|null|object
 
-### `private function pre_update_category_field($field)`
+### `private function pre_update_category_field($metadatum)`
 
 Stores the value of the taxonomy_id option to use on update_category_field method. 
 
 
 
 
-### `private function update_category_field($field)`
+### `private function update_category_field($metadatum)`
 
-Triggers hooks when saving a Category Field, indicating wich taxonomy was added or removed from a collection. 
+Triggers hooks when saving a Category Metadatum, indicating wich taxonomy was added or removed from a collection. 
 
-This is used by Taxonomies repository to update the collections_ids property of the taxonomy as a field type category is inserted or removed 
+This is used by Taxonomies repository to update the collections_ids property of the taxonomy as a metadatum type category is inserted or removed 
 
 
 **Parameters:**
 
-* `$field` — [type] — [description]
+* `$metadatum` — [type] — [description]
 
 **Returns:** `[type]` — [description]
 
 <!-- END DOC-COMMENT -->
 
-## Field Entity
+## Metadatum Entity
 
-<!-- BEGIN DOC-COMMENT H3 src/classes/entities/class-tainacan-field.php -->
-### `class Field extends Entity`
+<!-- BEGIN DOC-COMMENT H3 src/classes/entities/class-tainacan-metadatum.php -->
+### `class Metadatum extends Entity`
 
-Represents the Entity Field 
+Represents the Entity Metadatum 
 
 
-### `protected $repository = 'Fields'`
+### `protected $repository = 'Metadata'`
 
 {@inheritDoc} 
 ### `function get_name()`
 
-Return the field name 
+Return the metadatum name 
 
 
 **Returns:** string
 
 ### `function get_slug()`
 
-Get field slug 
+Get metadatum slug 
 
 
 **Returns:** string
 
 ### `function get_order()`
 
-Return the field order type 
+Return the metadatum order type 
 
 
 **Returns:** string
@@ -238,21 +238,21 @@ Return the parent ID
 
 ### `function get_description()`
 
-Return the field description 
+Return the metadatum description 
 
 
 **Returns:** string
 
 ### `function get_required()`
 
-Return if is a required field 
+Return if is a required metadatum 
 
 
 **Returns:** boolean
 
 ### `function get_multiple()`
 
-Return if is a multiple field 
+Return if is a multiple metadatum 
 
 
 **Returns:** boolean
@@ -266,7 +266,7 @@ Return the cardinality
 
 ### `function get_collection_key()`
 
-Return if field is key 
+Return if metadatum is key 
 
 
 **Returns:** boolean
@@ -280,35 +280,35 @@ Return the mask
 
 ### `function get_default_value()`
 
-Return the field default value 
+Return the metadatum default value 
 
 
 **Returns:** `string` — || integer
 
 ### `function get_field_type_object()`
 
-Return the an object child of \Tainacan\Field_Types\Field_Type with options 
+Return the an object child of \Tainacan\Metadatum_Types\Metadatum_Type with options 
 
 
-**Returns:** `\Tainacan\Field_Types\Field_Type` — The field type class with filled options
+**Returns:** `\Tainacan\Metadatum_Types\Metadatum_Type` — The metadatum type class with filled options
 
 ### `function get_field_type()`
 
-Return the class name for the field type 
+Return the class name for the metadatum type 
 
 
 **Returns:** `string` — The
 
 ### `function get_field_type_options()`
 
-Return the actual options for the current field type 
+Return the actual options for the current metadatum type 
 
 
-**Returns:** `array` — Configurations for the field type object
+**Returns:** `array` — Configurations for the metadatum type object
 
 ### `function set_name($value)`
 
-Set the field name 
+Set the metadatum name 
 
 
 **Parameters:**
@@ -319,14 +319,14 @@ Set the field name
 
 ### `function get_accept_suggestion()`
 
-Return true if this field allow community suggestions, false otherwise 
+Return true if this metadatum allow community suggestions, false otherwise 
 **Returns:** bool
 
 ### `function set_slug($value)`
 
-Set the field slug 
+Set the metadatum slug 
 
-If you dont set the field slug, it will be set automatically based on the name and following WordPress default behavior of creating slugs for posts. 
+If you dont set the metadatum slug, it will be set automatically based on the name and following WordPress default behavior of creating slugs for posts. 
 
 If you set the slug for an existing one, WordPress will append a number at the end of in order to make it unique (e.g slug-1, slug-2) 
 
@@ -339,7 +339,7 @@ If you set the slug for an existing one, WordPress will append a number at the e
 
 ### `function set_order($value)`
 
-Set manually the order of the field 
+Set manually the order of the metadatum 
 
 
 **Parameters:**
@@ -350,7 +350,7 @@ Set manually the order of the field
 
 ### `function set_parent($value)`
 
-Set the field parent ID 
+Set the metadatum parent ID 
 
 
 **Parameters:**
@@ -361,7 +361,7 @@ Set the field parent ID
 
 ### `function set_description($value)`
 
-Set field description 
+Set metadatum description 
 
 
 **Parameters:**
@@ -372,7 +372,7 @@ Set field description
 
 ### `function set_required( $value )`
 
-Allow the field be required 
+Allow the metadatum be required 
 
 
 **Parameters:**
@@ -383,7 +383,7 @@ Allow the field be required
 
 ### `function set_multiple( $value )`
 
-Allow multiple fields 
+Allow multiple metadata 
 
 
 **Parameters:**
@@ -394,7 +394,7 @@ Allow multiple fields
 
 ### `function set_cardinality( $value )`
 
-The number of  possible fields 
+The number of  possible metadata 
 
 
 **Parameters:**
@@ -416,7 +416,7 @@ Define if the value is key on the collection
 
 ### `function set_mask( $value )`
 
-Set mask for the field 
+Set mask for the metadatum 
 
 
 **Parameters:**
@@ -449,23 +449,23 @@ Set default value
 
 ### `public function set_field_type( $value )`
 
-set the field type class name 
+set the metadatum type class name 
 
 
 **Parameters:**
 
-* `|` — string — \Tainacan\Field_Types\Field_Type $value The name of the class or the instance
+* `|` — string — \Tainacan\Metadatum_Types\Metadatum_Type $value The name of the class or the instance
 
 ### `function set_accept_suggestion( $value )`
 
-Set if this field allow community suggestions 
+Set if this metadatum allow community suggestions 
 **Parameters:**
 
 * `$value` — bool
 
 ### `function set_field_type_options( $value )`
 
-Set Field type options 
+Set Metadatum type options 
 
 
 **Parameters:**
@@ -476,9 +476,9 @@ Set Field type options
 
 ### `public function get_enabled_for_collection()`
 
-Transient property used to store the status of the field for a particular collection 
+Transient property used to store the status of the metadatum for a particular collection 
 
-Used by the API to tell front end when a field is disabled 
+Used by the API to tell front end when a metadatum is disabled 
 
 
 
@@ -508,7 +508,7 @@ Return true if is required, else return false
 
 {@inheritdoc } 
 
-Also validates the field, calling the validate_options callback of the Field Type 
+Also validates the metadatum, calling the validate_options callback of the Metadatum Type 
 
 
 **Returns:** `bool` — valid or not
diff --git a/docs/class-reference-filters.md b/docs/class-reference-filters.md
index 920f55729..c87124b07 100644
--- a/docs/class-reference-filters.md
+++ b/docs/class-reference-filters.md
@@ -28,7 +28,7 @@ Filters are stored as posts. Check WP_Query docs to learn all args accepted in t
 
 ### `public function register_filter_type( $class_name )`
 
-register field types class on array of types 
+register metadatum types class on array of types 
 
 
 **Parameters:**
@@ -37,7 +37,7 @@ register field types class on array of types
 
 ### `public function deregister_filter_type( $class_name )`
 
-register field types class on array of types 
+register metadatum types class on array of types 
 
 
 **Parameters:**
@@ -64,7 +64,7 @@ fetch only supported filters for the type specified
 
 **Parameters:**
 
-* `string` — ( — || array )  $types Primitve types of field ( float, string, int)
+* `string` — ( — || array )  $types Primitve types of metadatum ( float, string, int)
 
 **Returns:** `array` — Filters supported by the primitive types passed in $types
 
@@ -79,7 +79,7 @@ fetch filters by collection, searches all filters available
 * `$args` — array — WP_Query args plus disabled_fields
 * `$output` — string — The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
 
-**Returns:** `Array` — Entities\Field
+**Returns:** `Array` — Entities\Metadatum
 
 ### `public function order_result( $result, Entities\Collection $collection )`
 
@@ -141,10 +141,10 @@ Return the filter color
 
 ### `function get_field()`
 
-Return the field 
+Return the metadatum 
 
 
-**Returns:** Field
+**Returns:** Metadatum
 
 ### `function get_filter_type_object()`
 
@@ -213,7 +213,7 @@ Define the filter color
 
 ### `function set_field( $value )`
 
-Define the filter field 
+Define the filter metadatum 
 
 
 **Returns:** void
@@ -231,7 +231,7 @@ Save the filter type class name
 
 {@inheritdoc } 
 
-Also validates the field, calling the validate_options callback of the Field Type 
+Also validates the metadatum, calling the validate_options callback of the Metadatum Type 
 
 
 **Returns:** `bool` — valid or not
diff --git a/docs/class-reference-item-metadata.md b/docs/class-reference-item-metadata.md
index a40318e59..0693bbfa6 100644
--- a/docs/class-reference-item-metadata.md
+++ b/docs/class-reference-item-metadata.md
@@ -5,9 +5,9 @@
 <!-- BEGIN DOC-COMMENT H3 src/classes/repositories/class-tainacan-item-metadata.php -->
 ### `if ( $item_metadata->get_field()->get_parent() > 0 && is_null($item_metadata->get_meta_id()) )`
 
-When we are adding a field that is child of another, this means it is inside a compound field 
+When we are adding a metadatum that is child of another, this means it is inside a compound metadatum 
 
-In that case, if the Item_Metadata object is not set with a meta_id, it means we want to create a new one and not update an existing. This is the case of a multiple compound field. 
+In that case, if the Item_Metadata object is not set with a meta_id, it means we want to create a new one and not update an existing. This is the case of a multiple compound metadatum. 
 
 
 ### `public function delete($item_metadata)`
@@ -24,7 +24,7 @@ In that case, if the Item_Metadata object is not set with a meta_id, it means we
 
 ### `public function fetch($object, $output = null )`
 
-Fetch Item Field objects related to an Item 
+Fetch Item Metadatum objects related to an Item 
 
 
 **Parameters:**
@@ -35,7 +35,7 @@ Fetch Item Field objects related to an Item
 
 ### `public function get_value(Entities\Item_Metadata_Entity $item_metadata)`
 
-Get the value for a Item field. 
+Get the value for a Item metadatum. 
 
 
 **Parameters:**
@@ -46,7 +46,7 @@ Get the value for a Item field.
 
 ### `private function extract_compound_value(array $ids, Entities\Item $item, $compund_meta_id)`
 
-Transforms the array saved as meta_value with the IDs of post_meta saved as a value for compound fields and converts it into an array of Item Metadatada Entitites 
+Transforms the array saved as meta_value with the IDs of post_meta saved as a value for compound metadata and converts it into an array of Item Metadatada Entitites 
 
 
 **Parameters:**
@@ -64,7 +64,7 @@ Transforms the array saved as meta_value with the IDs of post_meta saved as a va
 
 ### `public function suggest($item_metadata)`
 
-Suggest a value to be inserted as a item Field value, return a pending log 
+Suggest a value to be inserted as a item Metadatum value, return a pending log 
 **Parameters:**
 
 * `$item_metadata` — Entities\Item_Metadata_Entity
@@ -78,13 +78,13 @@ Suggest a value to be inserted as a item Field value, return a pending log
 <!-- BEGIN DOC-COMMENT H3 src/classes/entities/class-tainacan-item-metadata-entity.php -->
 ### `class Item_Metadata_Entity extends Entity`
 
-Represents the Item Field Entity 
+Represents the Item Metadatum Entity 
 
 
 ### `protected $repository = 'Item_Metadata'`
 
 {@inheritDoc} 
-### `function __construct(Item $item, Field $field, $meta_id = null, $parent_meta_id = null)`
+### `function __construct(Item $item, Metadatum $metadatum, $meta_id = null, $parent_meta_id = null)`
 
 
 
@@ -92,7 +92,7 @@ Represents the Item Field Entity
 **Parameters:**
 
 * `$item` — Item — Item Entity
-* `$field` — Field — Field Entity
+* `$metadatum` — Metadatum — Metadatum Entity
 * `$meta_id` — int — ID for a specific meta row
 
 ### `function set_item(Item $item)`
@@ -108,7 +108,7 @@ Define the item
 
 ### `function set_value($value)`
 
-Define the field value 
+Define the metadatum value 
 
 
 **Parameters:**
@@ -117,14 +117,14 @@ Define the field value
 
 **Returns:** void
 
-### `function set_field(Field $field)`
+### `function set_field(Metadatum $metadatum)`
 
-Define the field 
+Define the metadatum 
 
 
 **Parameters:**
 
-* `$field` — Field
+* `$metadatum` — Metadatum
 
 **Returns:** void
 
@@ -132,7 +132,7 @@ Define the field
 
 Set the specific meta ID for this metadata. 
 
-When this value is set, get_value() will use it to fetch the value from the post_meta table, instead of considering the item and field IDs 
+When this value is set, get_value() will use it to fetch the value from the post_meta table, instead of considering the item and metadatum IDs 
 
 
 **Parameters:**
@@ -141,9 +141,9 @@ When this value is set, get_value() will use it to fetch the value from the post
 
 ### `function set_parent_meta_id($parent_meta_id)`
 
-Set parent_meta_id. Used when a item_metadata is inside a compound Field 
+Set parent_meta_id. Used when a item_metadata is inside a compound Metadatum 
 
-When you have a multiple compound field, this indicates of which instace of the value this item_metadata is attached to 
+When you have a multiple compound metadatum, this indicates of which instace of the value this item_metadata is attached to 
 
 
 **Parameters:**
@@ -159,49 +159,49 @@ Return the item
 
 ### `function get_field()`
 
-Return the field 
+Return the metadatum 
 
 
-**Returns:** Field
+**Returns:** Metadatum
 
 ### `function get_meta_id()`
 
 Return the meta_id 
 
 
-**Returns:** Field
+**Returns:** Metadatum
 
 ### `function get_parent_meta_id()`
 
 Return the meta_id 
 
 
-**Returns:** Field
+**Returns:** Metadatum
 
 ### `function get_value()`
 
-Return the field value 
+Return the metadatum value 
 
 
 **Returns:** `string` — | integer
 
 ### `function is_multiple()`
 
-Return true if field is multiple, else return false 
+Return true if metadatum is multiple, else return false 
 
 
 **Returns:** boolean
 
 ### `function is_collection_key()`
 
-Return true if field is key 
+Return true if metadatum is key 
 
 
 **Returns:** boolean
 
 ### `function is_required()`
 
-Return true if field is required 
+Return true if metadatum is required 
 
 
 **Returns:** boolean
diff --git a/docs/class-reference-items.md b/docs/class-reference-items.md
index 52f1478a5..f151e9d74 100644
--- a/docs/class-reference-items.md
+++ b/docs/class-reference-items.md
@@ -240,9 +240,9 @@ Define the description
 
 Return a List of ItemMetadata objects 
 
-It will return all fields associeated with the collection this item is part of. 
+It will return all metadata associeated with the collection this item is part of. 
 
-If the item already has a value for any of the fields, it will be available. 
+If the item already has a value for any of the metadata, it will be available. 
 
 
 **Returns:** `array` — Array of ItemMetadata objects
diff --git a/docs/exporting-and-exposing.md b/docs/exporting-and-exposing.md
index f61f463e5..f75bd3039 100644
--- a/docs/exporting-and-exposing.md
+++ b/docs/exporting-and-exposing.md
@@ -6,9 +6,9 @@ But sometimes you dont want just to have your collections browsable via web, you
 
 ## Mapping
 
-With Tainacan you have the possibility to map your collection structure to one or more known standards you may want to be compatible with. So even if you use a custom set of fields to describe your collection, you may be compatible and interoperate with other repositories.
+With Tainacan you have the possibility to map your collection structure to one or more known standards you may want to be compatible with. So even if you use a custom set of metadata to describe your collection, you may be compatible and interoperate with other repositories.
 
-You do it by informing, for each field you create, what is it relative in each format you want to map your collection to. You may say for example, that you "Name" Field is the equivalent to the dc:Title attribute in Dublin Core and some another attribute in other format you choose.
+You do it by informing, for each metadatum you create, what is it relative in each format you want to map your collection to. You may say for example, that you "Name" Metadatum is the equivalent to the dc:Title attribute in Dublin Core and some another attribute in other format you choose.
 
 Tainacan is shipped with some Mapping standards that implement popular metadata standards. And it will be easy to create new standards.  See more [details about mapping standards](mapping-standards.md). 
 
@@ -18,13 +18,13 @@ You can also use these mapping standards as a pre-set when you create a new Coll
 
 Exporting allows you to download the content of your repository to a file - or to multiple files. The format of the package you will download depends on the exporter you will use. Tainacan ships with a simple CSV exporter and a Tainacan-Package exporter, that allows you to export all the content of your collections, including the attachments, to import in another Tainacan instance.
 
-Whatever exporter you choose to you use, you will be able to choose wether you want to download the collection as it is, which means, with the fields the way the were created in Tainacan, or wether you want to download it in a mapped version. For example, if you mapped your collection to Dublin Core, you can download a CSV file either in Dublin Core format or in the original format.
+Whatever exporter you choose to you use, you will be able to choose wether you want to download the collection as it is, which means, with the metadata the way the were created in Tainacan, or wether you want to download it in a mapped version. For example, if you mapped your collection to Dublin Core, you can download a CSV file either in Dublin Core format or in the original format.
 
 Tainacan makes it very easy to developers to create new exporters and publish them as plugins anyone can use.
 
 ## Exposing
 
-Tainacan is powered with an API that allows other applications to search and consume the content of your repository. By default, this API serves the content in JSON format, preserving the fields in the collections the way you created them.
+Tainacan is powered with an API that allows other applications to search and consume the content of your repository. By default, this API serves the content in JSON format, preserving the metadata in the collections the way you created them.
 
 In the same way you can choose the format of the file when you export your collection, one can choose the format he/she want to consume yout content in. This is what exposers are for.
 
diff --git a/docs/garbage-collector.md b/docs/garbage-collector.md
index bc93979a4..7c660d7ce 100644
--- a/docs/garbage-collector.md
+++ b/docs/garbage-collector.md
@@ -1,5 +1,5 @@
 
 * everything auto draft
-* post_meta of deleted fields
-* post_meta of deleted instaces of a multiple compound Field. post_meta of a field that is child of a compound field, but which the ID does not appear in any array of a compound field meta_value
+* post_meta of deleted metadata
+* post_meta of deleted instaces of a multiple compound Metadatum. post_meta of a metadatum that is child of a compound metadatum, but which the ID does not appear in any array of a compound metadatum meta_value
 * orphan terms (with taxonomy that does not exist)
\ No newline at end of file
diff --git a/docs/importer-flow.md b/docs/importer-flow.md
index bb7ebe91a..a07288141 100644
--- a/docs/importer-flow.md
+++ b/docs/importer-flow.md
@@ -18,7 +18,7 @@ If called from inside a collection, this step is skipped and the current collect
 If the importer has the attribute `$import_structure_and_mapping` set to `true`, and the importer is called from repository level,
 they will also be able to choose to create a new collection. 
 
-In that cases, a new collection is created, and the importer must implement a method called `create_fields_and_mapping()`, which, as the name says, will create all collections fields and set the mapping for the importer.
+In that cases, a new collection is created, and the importer must implement a method called `create_fields_and_mapping()`, which, as the name says, will create all collections metadata and set the mapping for the importer.
 
 
 ## Set options
@@ -79,12 +79,12 @@ From that point forward, the importer will behave just as if it was using the fi
 
 ## Mapping
 
-At this point the user is presented with an interface to map the fields from the source to the fields present in the chosen collection.
+At this point the user is presented with an interface to map the metadata from the source to the metadata present in the chosen collection.
 
-The Importer class must implement the `get_fields()` method, that will return an array of the fields found in the source. It can either return an hard coded array or an array that is red from the source file. For example, an importer that fetches data from an api knows beforehand what are the fields the api will return, however, an importer that reads from a csv, may want to return whatever is found in the first line of the array. 
+The Importer class must implement the `get_fields()` method, that will return an array of the metadata found in the source. It can either return an hard coded array or an array that is red from the source file. For example, an importer that fetches data from an api knows beforehand what are the metadata the api will return, however, an importer that reads from a csv, may want to return whatever is found in the first line of the array. 
 
 ```
-// Example 1: returns a hard coded set of fields
+// Example 1: returns a hard coded set of metadata
 function get_fields() {
 	return [
 		'title',
@@ -103,7 +103,7 @@ public function get_fields(){
 
 ## Importing Collection Structure and Mapping
 
-Alternatively, an importer may also create all the fields and mappings from the source. In that cases, the user does not have to map anything.
+Alternatively, an importer may also create all the metadata and mappings from the source. In that cases, the user does not have to map anything.
 
 First thing an Importer must do to accomplish this is to declare it does so in the `construct()`, by setting `$import_structure_and_mapping` to `true`.
 
@@ -115,38 +115,38 @@ function __construct() {
 }
 ```
 
-Second, the importer must implement the `create_fields_and_mapping()` to populate the collection with fields and set the mapping.
+Second, the importer must implement the `create_fields_and_mapping()` to populate the collection with metadata and set the mapping.
 
-In order to do this, the Importer will use Tainacan internal API to create the fields. Please refer to the documentation (TODO: write this documentation).
+In order to do this, the Importer will use Tainacan internal API to create the metadata. Please refer to the documentation (TODO: write this documentation).
 
-This method must be aware that even a brand new collection comes with two core fields (title and description), and use them.
+This method must be aware that even a brand new collection comes with two core metadata (title and description), and use them.
 
-Again, this fields can come from the file, the URL or may be hardcoded in the function.
+Again, this metadata can come from the file, the URL or may be hardcoded in the function.
 
 Example
 ```
 function create_fields_and_mapping() {
 	
-	$fields_repository = \Tainacan\Repositories\Fields::get_instance();
+	$metadata_repository = \Tainacan\Repositories\Metadata::get_instance();
 	
-	$newField1 = new \Tainacan\Entities\Field();
-	$newField1->set_name = 'New Field';
-	$newField1->set_field_type = 'Tainacan\Field_Types\Text';
-	$newField1->set_collection($this->collection);
+	$newMetadatum1 = new \Tainacan\Entities\Metadatum();
+	$newMetadatum1->set_name = 'New Metadatum';
+	$newMetadatum1->set_field_type = 'Tainacan\Metadatum_Types\Text';
+	$newMetadatum1->set_collection($this->collection);
 	
-	$newField1->validate(); // there is no user input here, so we can be sure it will validate.
+	$newMetadatum1->validate(); // there is no user input here, so we can be sure it will validate.
 
-	$newField1 = $fields_repository->insert($newField1);
+	$newMetadatum1 = $metadata_repository->insert($newMetadatum1);
 
 	$source_fields = $this->get_fields();
 	
 	$this->set_mapping([
-		$newField1->get_id() => $source_fields[0]
+		$newMetadatum1->get_id() => $source_fields[0]
 	]);
 	
 }
 
-TODO: helpers and explanation on how to fetch the core fields and map them
+TODO: helpers and explanation on how to fetch the core metadata and map them
 
 ```
 
@@ -159,6 +159,6 @@ The `run()` method is called, the importer runs a step of the import process, an
 
 In order to allow this, the importer must implement the `get_total_items_from_source()` method, which will inform the total number of items present in the source.
 
-All the steps and insertion are handled by the Importer super class. The importer class only have to implement one method (`process_item()`) to handle one single item. It will receive the index of this item and it must return the item in as an array, where each key is the identifier of the source field (the same used in the mapping array), and the values are each field value.
+All the steps and insertion are handled by the Importer super class. The importer class only have to implement one method (`process_item()`) to handle one single item. It will receive the index of this item and it must return the item in as an array, where each key is the identifier of the source metadatum (the same used in the mapping array), and the values are each metadatum value.
 
 In the end, a report is generated with all the logs generated in the process. 
\ No newline at end of file
diff --git a/docs/internal-api.md b/docs/internal-api.md
index 50160fbbf..cb4fbb6fb 100644
--- a/docs/internal-api.md
+++ b/docs/internal-api.md
@@ -1,6 +1,6 @@
 # Tainacan Internal API
 
-This page shows how the internal API works and how to create and fetch all kinds of entities in Tainacan: Collections, items, taxnomies, fields, filters, terms, item metadata and logs.
+This page shows how the internal API works and how to create and fetch all kinds of entities in Tainacan: Collections, items, taxnomies, metadata, filters, terms, item metadata and logs.
 
 Its important that you first get familiar with the [key concepts](key-concepts.md) of tainacan. 
 
@@ -9,7 +9,7 @@ This page gives an overview of the API. Detailed documentation and reference on
 * [Collections Reference](class-reference-collections.md)
 * [Items Reference](class-reference-items.md)
 * [Item Metadata Reference](class-reference-item-metadata.md)
-* [Fields Reference](class-reference-fields.md)
+* [Metadata Reference](class-reference-metadata.md)
 * [Filters Reference](class-reference-filters.md)
 * [Taxonomies Reference](class-reference-taxonomies.md)
 * [Terms Reference](class-reference-terms.md)
@@ -24,21 +24,21 @@ This layer is based on a Repository pattern. Each entity Tainacan deals with hav
 Repositories are the classes that comunicate with the database and know where everything is stored and how to find things. It is a singleton class, so it have only one instance available to be used by any part of the application.
 
 ```PHP
-$fields_repo = Tainacan\Repositories\Fields::get_instance();
+$metadata_repo = Tainacan\Repositories\Metadata::get_instance();
 ```
 Entities classes are the representation of the individual of each repository. 
 
 This abstraction allows us to easily manipulate entities without worrying how to save or fetch them.
 
-For example, Fields have many attributes, such as `name` and `required` (indicating wether this field is required or not). As mentioned before, Fields are stored as posts of a special post type called `tainacan-field`. The name of the field is, of course, the `post_title` and this `required` attribute is stored as a `post_meta`.
+For example, Metadata have many attributes, such as `name` and `required` (indicating wether this metadatum is required or not). As mentioned before, Metadata are stored as posts of a special post type called `tainacan-metadatum`. The name of the metadatum is, of course, the `post_title` and this `required` attribute is stored as a `post_meta`.
 
 However, you dont need to bother about that. This pattern allows you to manipulate a Field entity and it attributes in a transparent way, such as:
 
 ```PHP
-$field->get_name(); // returns the field name
-$field->get_required(); // returns the required value 
-$field->set_name('new name');
-$field->set_required('yes');
+$metadatum->get_name(); // returns the metadatum name
+$metadatum->get_required(); // returns the required value 
+$metadatum->set_name('new name');
+$metadatum->set_required('yes');
 ```
 
 Tainacan will automatically map the values of the attributes to and from where they are stored.
@@ -46,7 +46,7 @@ Tainacan will automatically map the values of the attributes to and from where t
 When you want to fetch entities from the database, this abstraction layer steps aside and let you use all the power and flexibility of `WP_Query`, which you know and love. For example:
 
 ```PHP
-Repositories\Fields::get_instance()->fetch('s=test');
+Repositories\Metadata::get_instance()->fetch('s=test');
 ```
 
 The `fetch` method from the repositories accept exactly the same arguments accepted by `WP_Query` and uses it internally. In fact, you could use `WP_Query` directly if you prefer, but using the repository class gives you some advantages. You dont have to know the name of the post type, you can also fetch by some mapped attribute calling it directly, withour having to use `meta_query` (or even know wether a property is stored as a post attribute or post_meta). See more details in the Fetch section below.
@@ -106,15 +106,15 @@ $items = $items_repo->fetch([
 Note that you can use the mapped attribute names to build your query, but it is just fine if you want to use the native WordPress names. The same can be achievied with attributes stored as post_meta:
 
 ```PHP
-$repo = Tainacan\Repositories\Fields::get_instance();
+$repo = Tainacan\Repositories\Metadata::get_instance();
 
-$fields = $repo->fetch([
+$metadata = $repo->fetch([
 	'required' => 'yes'
 ]);
 
 // is the same as
 
-$fields = $repo->fetch([
+$metadata = $repo->fetch([
 	'meta_query' => [
 		[
 			'key' => 'required',
@@ -176,13 +176,13 @@ Well, Item Metadata Entity is slightly different.
 
 `Item Metada` is a special kind of entity, because it is not an actual entity itself. Rather, it is the relationship between an Item and a Field. And this relationship has a value.
 
-So imagine a Collection of pens has a Field called "color". This means the an item of this collection will have a relationship with this field, and this relation will have a value. Red, for example.
+So imagine a Collection of pens has a Field called "color". This means the an item of this collection will have a relationship with this metadatum, and this relation will have a value. Red, for example.
 
-So the Item Metadata Entity constructor gets to entities: an item and a field. Lets see an example, considering I alredy have a collection with fields and an item.
+So the Item Metadata Entity constructor gets to entities: an item and a metadatum. Lets see an example, considering I alredy have a collection with metadata and an item.
 
 ```PHP
-// Considering $item is an existing Item Entity an $field an existing Field Entity
-$itemMetadada = new \Tainacan\Entities\ItemMetadataEntity($item, $field);
+// Considering $item is an existing Item Entity an $metadatum an existing Field Entity
+$itemMetadada = new \Tainacan\Entities\ItemMetadataEntity($item, $metadatum);
 
 $itemMetadata->set_value('Red');
 
@@ -195,20 +195,20 @@ if ($itemMetadata->validate()) {
 
 ```
 
-> Note: "Multiple" Fields, which can have more than one value for the same item, work exactly the same way, with the difference that its value is an array of values, and not just one single value. 
+> Note: "Multiple" Metadata, which can have more than one value for the same item, work exactly the same way, with the difference that its value is an array of values, and not just one single value. 
 
-If you want to iterate over all fields of an item or a collection, there are 2 usefull methods you can use. Fields repository have a `fetch_by_collection()` method that will fetch all fields from a given collection and return them in the right order.
+If you want to iterate over all metadata of an item or a collection, there are 2 usefull methods you can use. Metadata repository have a `fetch_by_collection()` method that will fetch all metadata from a given collection and return them in the right order.
 
 Also, ItemMetadata Repository `fetch()` method will return an array of ItemMetadata Entities related to a given item. 
 
 
-### Handling Compound fields
+### Handling Compound metadata
 
-Compound fields are a special type of fields that support child fields. It is a group of fields.
+Compound metadata are a special type of metadata that support child metadata. It is a group of metadata.
 
-The Compound field itself does not have a value, only its children have. So when you are saving a new value for a child field of a compound field, it will behave as it was a normal field.
+The Compound metadatum itself does not have a value, only its children have. So when you are saving a new value for a child metadatum of a compound metadatum, it will behave as it was a normal metadatum.
 
-However, when you save the value for the second field of that same group, you must inform that it belong to that group. You do this by passing a `parent_meta_id` when initializing the Item Metada Entity. Note that you will only have this ID after you saved the first ItemMetadata of that group, because only then the group was created.
+However, when you save the value for the second metadatum of that same group, you must inform that it belong to that group. You do this by passing a `parent_meta_id` when initializing the Item Metada Entity. Note that you will only have this ID after you saved the first ItemMetadata of that group, because only then the group was created.
 
 ```PHP
 
@@ -239,10 +239,10 @@ $compoundValue = $compoundItemMeta->get_value();
 
 // This is an array of ItemMetadata Entities
 
-foreach ($compoundValue as $field_id => $childItemMeta) {
+foreach ($compoundValue as $metadatum_id => $childItemMeta) {
 	var_dump( $childItemMeta instanceof \Tainacan\Entities\ItemMetadataEntity ); // true
-	var_dump( $field_id == $childItemMeta->get_field()->get_id() ); // true
-	echo "Value for field " . $childItemMeta->get_field()->get_name() " (child of " . $compoundItemMeta->get_name() . ") is:" . $childItemMeta->get_value();
+	var_dump( $metadatum_id == $childItemMeta->get_field()->get_id() ); // true
+	echo "Value for metadatum " . $childItemMeta->get_field()->get_name() " (child of " . $compoundItemMeta->get_name() . ") is:" . $childItemMeta->get_value();
 	var_dump( $childItemMeta->get_field()->get_parent() == compoundItemMeta->get_field()->get_id() ); // true
 	var_dump( is_int($childItemMeta->get_meta_id()) && $childItemMeta->get_parent_meta_id() ); // true. they are allways set when initialized by calling get_value() on the parent ItemMetadataEntity
 }
@@ -258,9 +258,9 @@ TODO: document the validation chains
 
 All validations validate the property with the validation declared in the get_map() method of the repository.
 
-Validate item -> call ItemMetadata->validate() for each field
+Validate item -> call ItemMetadata->validate() for each metadatum
 
-Validate ItemMetadata -> call $fieldType->validate() for the Field type of the field.
+Validate ItemMetadata -> call $metadatumType->validate() for the Field type of the metadatum.
 
 Validate Field -> call validate_options() of the Field type
 
diff --git a/docs/key-concepts.md b/docs/key-concepts.md
index f01f2be18..287149ab4 100644
--- a/docs/key-concepts.md
+++ b/docs/key-concepts.md
@@ -3,21 +3,21 @@
 The typical workflow when you create a Digital Repository with Tainacan is:
 
 * Create a collection
-* Choose which fields the item in this collections will have
+* Choose which metadata the item in this collections will have
 * Choose which filters will be used when browsing the collection
 * Insert items to the collection or import them from an external source
 
 ## Collections
 
-A collection is a group of items, that share the same set of fields. Every item uploaded to your digital repository will be part of a collection - and only one collection. For instance, you could have a "paintings" collections, with fields such as Title, Author, Country, Tecnique, etc and another collection for "films", with Title, Director, Country and Genre.
+A collection is a group of items, that share the same set of metadata. Every item uploaded to your digital repository will be part of a collection - and only one collection. For instance, you could have a "paintings" collections, with metadata such as Title, Author, Country, Tecnique, etc and another collection for "films", with Title, Director, Country and Genre.
 
-For each collection you can set a different set of fields and they can share common categories, which means you could browse for items in a specific Country, and get both paintings and films in your results. 
+For each collection you can set a different set of metadata and they can share common categories, which means you could browse for items in a specific Country, and get both paintings and films in your results. 
 
-Collections can also have child collections, which will inherit parent's collection fields and can add their own set of additional information.
+Collections can also have child collections, which will inherit parent's collection metadata and can add their own set of additional information.
 
 ## Items
 
-Items are the actual content of yout repository. The painting, the film, the book and so on. They belong to a collection and have all the fields configured in the collection it belongs to.
+Items are the actual content of yout repository. The painting, the film, the book and so on. They belong to a collection and have all the metadata configured in the collection it belongs to.
 
 In WordPress language, each item is a post and its post type represents its collection.
 
@@ -51,13 +51,13 @@ Metadata Types can be created via plugins and extend the default set of types sh
 
 ## Filters
 
-For every collection, you may choose which fields will be used to filter the results in a faceted search interface. These are the filters.
+For every collection, you may choose which metadata will be used to filter the results in a faceted search interface. These are the filters.
 
 Filters give the ability to the user to filter items in a collection using a Filter Type.
 
 ## Filter Types
 
-Filter types are the different types of interfaces to filter items in a collections based on one specific Field. Examples of Filter Types are "input text", "datepicker", "date range picker", "number range slider", "list of checkboxes", etc.
+Filter types are the different types of interfaces to filter items in a collections based on one specific Metadatum. Examples of Filter Types are "input text", "datepicker", "date range picker", "number range slider", "list of checkboxes", etc.
 
 Each Filter Type object have its own settings and web component that will be used to render the interface.
 
@@ -89,7 +89,7 @@ An item type can be anything. For example, LPs, Books and paintings are õbvious
 
 Desktop holds items that are not part of any collections yet. You might want to use it when you want to upload a bunch of items and organize them afterwards, instead of having to thinh an prepare all the collections beforehand.
 
-Items in Desktop are not publicly visible and have only the fields configured in repository level.
+Items in Desktop are not publicly visible and have only the metadata configured in repository level.
 
 ### Thematic Collections
 
diff --git a/docs/mapping-standards.md b/docs/mapping-standards.md
index 42121f1a7..8dd519b6b 100644
--- a/docs/mapping-standards.md
+++ b/docs/mapping-standards.md
@@ -1,6 +1,6 @@
 # Mapping Standards
 
-Mapping Standards are declarations of standards of metadata. Once they are available and activated in your repository, you can map the fields of your collections to them.
+Mapping Standards are declarations of standards of metadata. Once they are available and activated in your repository, you can map the metadata of your collections to them.
 
 ## Structure
 
@@ -10,20 +10,20 @@ A Mapping Standard has the following attributes.
 
 The name of the Mapping Standard.
 
-### Fields
+### Metadata
 
-A list of fields, terms or attributes that this mapping have. These are the element you will be able to map your Collection's Fields.
+A list of metadata, terms or attributes that this mapping have. These are the element you will be able to map your Collection's Metadata.
 
-Each field has the following attributes:
+Each metadatum has the following attributes:
 
-* Name - The field name, that refers to the name of the attribute in the origin vocabulary or ontology (e.g. title)
+* Name - The metadatum name, that refers to the name of the attribute in the origin vocabulary or ontology (e.g. title)
 * Label - The human readable name
 * URI - The URI of this term/attribute in the origin Ontoloy/Vocabulary
 
 
-### Allow additional custom fields
+### Allow additional custom metadata
 
-Boolen indicating wether this mapping allows additional custom fields to be added.
+Boolen indicating wether this mapping allows additional custom metadata to be added.
 
 ### Context URL / Vocab URL
 
@@ -38,7 +38,7 @@ The Class of the ontology that this mapping refers to. For example `CreativeWork
 ```
 {
 	'name': 'Dublin Core',
-	'fields': {
+	'metadata': {
 		{
 			'name': 'title',
 			'label': 'Title',
@@ -59,7 +59,7 @@ The Class of the ontology that this mapping refers to. For example `CreativeWork
 ```
 {
 	'name': 'Schema.org Creative Works',
-	'fields': {
+	'metadata': {
 		{
 			'name': 'name',
 			'label': 'Name',
diff --git a/docs/permissions.md b/docs/permissions.md
index d7d59c68b..f428a2fd3 100644
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -209,7 +209,7 @@ Allows to view Items marked as private and its items.
 
 ### Categories
 
-### Fields
+### Metadata
 
 ### Filters
 
diff --git a/docs/tainacan-api.md b/docs/tainacan-api.md
index 43bc174c5..dfd5bbc2f 100644
--- a/docs/tainacan-api.md
+++ b/docs/tainacan-api.md
@@ -11,8 +11,8 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
 
 1. [Collections](#collections)
 1. [Items](#items)
-1. [Fields](#fields)
-1. [Field Types](#field-types)
+1. [Metadata](#metadata)
+1. [Metadatum Types](#metadatum-types)
 1. [Item Metadata](#item-metadata)
 1. [Taxonomies](#taxonomies)
 1. [Filters](#filters)
@@ -117,22 +117,22 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
 ```
 
 ------
-#### Fields
+#### Metadata
 
-1. Route `wp-json/tainacan/v2/collection/(?P<collection_id>[\d]+)/fields`
+1. Route `wp-json/tainacan/v2/collection/(?P<collection_id>[\d]+)/metadata`
     
       1. Endpoints:
-            1. GET (Fetch all collection field)
+            1. GET (Fetch all collection metadatum)
                 
-            1. POST (Create a field in collection and all it items)
+            1. POST (Create a metadatum in collection and all it items)
     
-                  In body of requisition pass a JSON with the attributes of field like:
+                  In body of requisition pass a JSON with the attributes of metadatum like:
    
 ```javascript
       {
             "name": "string", 
             "description": "string",
-            "field_type": "string",
+            "metadatum_type": "string",
             "order": "string",
             "parent": "integer",
             "required": "string",
@@ -145,15 +145,15 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
       }
 ```
 
-2. Route `wp-json/tainacan/v2/collection/(?P<collection_id>[\d]+)/fields/(?P<field_id>[\d]+)`
+2. Route `wp-json/tainacan/v2/collection/(?P<collection_id>[\d]+)/metadata/(?P<field_id>[\d]+)`
 
       1. Endpoints:
       
-            1. GET (Fetch a field from a collection or Fetch all field values)
+            1. GET (Fetch a metadatum from a collection or Fetch all metadatum values)
             
-                  To fetch all field values from a field of a collection in all it items, pass a query like `?fetch=all_field_values`
+                  To fetch all metadatum values from a metadatum of a collection in all it items, pass a query like `?fetch=all_field_values`
 
-            1. PATCH or PUT (Update a field in a collection and all it items)
+            1. PATCH or PUT (Update a metadatum in a collection and all it items)
 
                   In body of requisition pass a JSON with the attributes you need to update, like:
 
@@ -164,37 +164,37 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
       }
 ```
 
-3. Route `wp-json/tainacan/v2/fields`
+3. Route `wp-json/tainacan/v2/metadata`
 
       1. Endpoints:
       
-            1. GET (Fetch all default fields)
+            1. GET (Fetch all default metadata)
             
-            1. POST (Create a default field)
+            1. POST (Create a default metadatum)
             
-                  In body of requisition pass a JSON with the attributes of field.
+                  In body of requisition pass a JSON with the attributes of metadatum.
 
-4. Route `wp-json/tainacan/v2/fields/(?P(<field_id>[\d]+))`
+4. Route `wp-json/tainacan/v2/metadata/(?P(<field_id>[\d]+))`
 
       1. Endpoints:
       
-            1. DELETE (Trash a default field)
+            1. DELETE (Trash a default metadatum)
             
-            1. PATCH or PUT (Update a default field)
+            1. PATCH or PUT (Update a default metadatum)
                   
                   In body of requisition pass a JSON with the attributes you need to update.
                   
 ------
-#### Field Types
-1. Route `wp-json/tainacan/v2/field-types`
+#### Metadatum Types
+1. Route `wp-json/tainacan/v2/metadatum-types`
 
       1. Endpoint:
       
-            1. GET (Fetch all field types)
+            1. GET (Fetch all metadatum types)
 ------
 #### Item Metadata
 
-1. Route `wp-json/tainacan/v2/item/(?P<item_id>[\d]+)/metadata/(?P<metadata_id>[\d]+)`
+1. Route `wp-json/tainacan/v2/item/(?P<item_id>[\d]+)/metadata/(?P<metadatum_id>[\d]+)`
 
       1. Endpoints:
     
@@ -271,7 +271,7 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
 ------
 #### Filters
 
-1. Route `wp-json/tainacan/v2/collection/(?P<collection_id>[\d]+)/field/(?P<field_id>[\d]+)/filters`
+1. Route `wp-json/tainacan/v2/collection/(?P<collection_id>[\d]+)/metadatum/(?P<field_id>[\d]+)/filters`
     
       1. Endpoints:
     
@@ -317,7 +317,7 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
 
             1. GET (Fetch all repository filters)
             
-            1. POST (Create a filter in repository. Without field and collection associations)
+            1. POST (Create a filter in repository. Without metadatum and collection associations)
             
                   Example of JSON passed in body for creating a filter:
     
@@ -338,7 +338,7 @@ A REST API for Tainacan Plugin. This API uses the Wordpress REST API.
             
             1. GET (Fetch all collection filters)
             
-            1. POST (Create a filter in a collection, without field association)
+            1. POST (Create a filter in a collection, without metadatum association)
             
                   Example of JSON passed in body for creating a filter:
     
diff --git a/package-lock.json b/package-lock.json
index d3e4e4360..64f2f6ce5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,10 +9,10 @@
       "integrity": "sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "date-fns": "1.29.0",
-        "figures": "1.7.0"
+        "chalk": "^1.1.3",
+        "cli-cursor": "^1.0.2",
+        "date-fns": "^1.27.2",
+        "figures": "^1.7.0"
       }
     },
     "@cypress/xvfb": {
@@ -21,7 +21,7 @@
       "integrity": "sha512-EfRzw+wgI0Zdb4ZlhSvjh3q7I+oenqEYPXvr7oH/2RnzQqGDrPr7IU1Pi2yzGwoXmkNUQbo6qvntnItvQj0F4Q==",
       "dev": true,
       "requires": {
-        "lodash.once": "4.1.1"
+        "lodash.once": "^4.1.1"
       }
     },
     "@mrmlnc/readdir-enhanced": {
@@ -30,8 +30,8 @@
       "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
       "dev": true,
       "requires": {
-        "call-me-maybe": "1.0.1",
-        "glob-to-regexp": "0.3.0"
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
       }
     },
     "@sindresorhus/is": {
@@ -64,8 +64,8 @@
       "integrity": "sha512-7aIt9QMRdxuagLLI48dPz96YJdhu64p6FCa6n4qkGN5DQLHnrIjZpD9bXCvV2G0NwgZ1FAmfP214dxc5zNCfgQ==",
       "dev": true,
       "requires": {
-        "@types/chai": "4.0.8",
-        "@types/jquery": "3.2.16"
+        "@types/chai": "*",
+        "@types/jquery": "*"
       }
     },
     "@types/jquery": {
@@ -104,8 +104,8 @@
       "integrity": "sha512-EkI/ZvJT4hglWo7Ipf9SX+J+R9htNOMjW8xiOhce7+0csqvgoF5IXqY5Ae1GqRgNtWCuaywR5HjVa1snkTqpOw==",
       "dev": true,
       "requires": {
-        "@types/chai": "4.0.8",
-        "@types/sinon": "4.0.0"
+        "@types/chai": "*",
+        "@types/sinon": "*"
       }
     },
     "@vue/component-compiler-utils": {
@@ -114,15 +114,15 @@
       "integrity": "sha512-CerIPMzE6y4J4v68nUh2NFPjOO8zr2r8UDh/yi63E4bf7YB5Aqhm7Fv90zzTF+sOQgsqTb9dgryvpeDY1/7m9g==",
       "dev": true,
       "requires": {
-        "consolidate": "0.15.1",
-        "hash-sum": "1.0.2",
-        "lru-cache": "4.1.3",
-        "merge-source-map": "1.1.0",
-        "postcss": "6.0.21",
-        "postcss-selector-parser": "3.1.1",
-        "prettier": "1.11.1",
-        "source-map": "0.5.7",
-        "vue-template-es2015-compiler": "1.6.0"
+        "consolidate": "^0.15.1",
+        "hash-sum": "^1.0.2",
+        "lru-cache": "^4.1.2",
+        "merge-source-map": "^1.1.0",
+        "postcss": "^6.0.20",
+        "postcss-selector-parser": "^3.1.1",
+        "prettier": "^1.11.1",
+        "source-map": "^0.5.6",
+        "vue-template-es2015-compiler": "^1.6.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -131,8 +131,8 @@
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         },
         "postcss-selector-parser": {
@@ -141,9 +141,9 @@
           "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
           "dev": true,
           "requires": {
-            "dot-prop": "4.2.0",
-            "indexes-of": "1.0.1",
-            "uniq": "1.0.1"
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         }
       }
@@ -156,7 +156,7 @@
       "requires": {
         "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
         "@webassemblyjs/wast-parser": "1.4.3",
-        "debug": "3.1.0",
+        "debug": "^3.1.0",
         "webassemblyjs": "1.4.3"
       },
       "dependencies": {
@@ -183,7 +183,7 @@
       "integrity": "sha512-e8+KZHh+RV8MUvoSRtuT1sFXskFnWG9vbDy47Oa166xX+l0dD5sERJ21g5/tcH8Yo95e9IN3u7Jc3NbhnUcSkw==",
       "dev": true,
       "requires": {
-        "debug": "3.1.0"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -228,7 +228,7 @@
         "@webassemblyjs/helper-buffer": "1.4.3",
         "@webassemblyjs/helper-wasm-bytecode": "1.4.3",
         "@webassemblyjs/wasm-gen": "1.4.3",
-        "debug": "3.1.0"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -248,7 +248,7 @@
       "integrity": "sha512-4u0LJLSPzuRDWHwdqsrThYn+WqMFVqbI2ltNrHvZZkzFPO8XOZ0HFQ5eVc4jY/TNHgXcnwrHjONhPGYuuf//KQ==",
       "dev": true,
       "requires": {
-        "leb": "0.3.0"
+        "leb": "^0.3.0"
       }
     },
     "@webassemblyjs/validation": {
@@ -274,7 +274,7 @@
         "@webassemblyjs/wasm-opt": "1.4.3",
         "@webassemblyjs/wasm-parser": "1.4.3",
         "@webassemblyjs/wast-printer": "1.4.3",
-        "debug": "3.1.0"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -309,7 +309,7 @@
         "@webassemblyjs/helper-buffer": "1.4.3",
         "@webassemblyjs/wasm-gen": "1.4.3",
         "@webassemblyjs/wasm-parser": "1.4.3",
-        "debug": "3.1.0"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -346,7 +346,7 @@
         "@webassemblyjs/floating-point-hex-parser": "1.4.3",
         "@webassemblyjs/helper-code-frame": "1.4.3",
         "@webassemblyjs/helper-fsm": "1.4.3",
-        "long": "3.2.0",
+        "long": "^3.2.0",
         "webassemblyjs": "1.4.3"
       }
     },
@@ -358,7 +358,7 @@
       "requires": {
         "@webassemblyjs/ast": "1.4.3",
         "@webassemblyjs/wast-parser": "1.4.3",
-        "long": "3.2.0"
+        "long": "^3.2.0"
       }
     },
     "abbrev": {
@@ -373,7 +373,7 @@
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.18",
+        "mime-types": "~2.1.18",
         "negotiator": "0.6.1"
       },
       "dependencies": {
@@ -389,7 +389,7 @@
           "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
           "dev": true,
           "requires": {
-            "mime-db": "1.33.0"
+            "mime-db": "~1.33.0"
           }
         }
       }
@@ -406,7 +406,7 @@
       "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
       "dev": true,
       "requires": {
-        "acorn": "5.5.3"
+        "acorn": "^5.0.0"
       }
     },
     "acorn-jsx": {
@@ -415,7 +415,7 @@
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
       "requires": {
-        "acorn": "3.3.0"
+        "acorn": "^3.0.4"
       },
       "dependencies": {
         "acorn": {
@@ -431,10 +431,10 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
       "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
       }
     },
     "ajv-keywords": {
@@ -491,8 +491,8 @@
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "3.1.10",
-        "normalize-path": "2.1.1"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
     "aproba": {
@@ -507,8 +507,8 @@
       "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
       "dev": true,
       "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
       }
     },
     "argparse": {
@@ -517,7 +517,7 @@
       "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
       "dev": true,
       "requires": {
-        "sprintf-js": "1.0.3"
+        "sprintf-js": "~1.0.2"
       }
     },
     "arr-diff": {
@@ -562,8 +562,8 @@
       "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.11.0"
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
       }
     },
     "array-union": {
@@ -572,7 +572,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "array-uniq": "^1.0.1"
       }
     },
     "array-uniq": {
@@ -604,9 +604,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "assert": {
@@ -642,7 +642,7 @@
       "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.5"
+        "lodash": "^4.14.0"
       }
     },
     "async-each": {
@@ -674,12 +674,12 @@
       "integrity": "sha512-buY1XxFoBrXvLsoFb0jP+niSu1tCj2RwMwHj96+RfQ8DJTgb0vUhh0dg6wjJT3JzsFYBrkSj8/sGtarNdlxTFw==",
       "dev": true,
       "requires": {
-        "browserslist": "3.2.7",
-        "caniuse-lite": "1.0.30000842",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "6.0.22",
-        "postcss-value-parser": "3.3.0"
+        "browserslist": "^3.2.7",
+        "caniuse-lite": "^1.0.30000839",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^6.0.22",
+        "postcss-value-parser": "^3.2.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -688,7 +688,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -697,9 +697,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "postcss": {
@@ -708,9 +708,9 @@
           "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1",
-            "source-map": "0.6.1",
-            "supports-color": "5.4.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         },
         "source-map": {
@@ -725,7 +725,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -746,8 +746,8 @@
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
       "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
       "requires": {
-        "follow-redirects": "1.4.1",
-        "is-buffer": "1.1.6"
+        "follow-redirects": "^1.3.0",
+        "is-buffer": "^1.1.5"
       }
     },
     "babel-code-frame": {
@@ -756,9 +756,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       }
     },
     "babel-core": {
@@ -767,25 +767,25 @@
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.1",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.5.1",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.5",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.8",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
       }
     },
     "babel-generator": {
@@ -794,14 +794,14 @@
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.5",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
       }
     },
     "babel-helper-bindify-decorators": {
@@ -810,9 +810,9 @@
       "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-builder-binary-assignment-operator-visitor": {
@@ -821,9 +821,9 @@
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
       "dev": true,
       "requires": {
-        "babel-helper-explode-assignable-expression": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-call-delegate": {
@@ -832,10 +832,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-define-map": {
@@ -844,10 +844,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -856,9 +856,9 @@
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-explode-class": {
@@ -867,10 +867,10 @@
       "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
       "dev": true,
       "requires": {
-        "babel-helper-bindify-decorators": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-bindify-decorators": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-function-name": {
@@ -879,11 +879,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-get-function-arity": {
@@ -892,8 +892,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-hoist-variables": {
@@ -902,8 +902,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -912,8 +912,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-regex": {
@@ -922,9 +922,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -933,11 +933,11 @@
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-replace-supers": {
@@ -946,12 +946,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helpers": {
@@ -960,8 +960,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-loader": {
@@ -970,9 +970,9 @@
       "integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "1.0.0",
-        "loader-utils": "1.1.0",
-        "mkdirp": "0.5.1"
+        "find-cache-dir": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1"
       }
     },
     "babel-messages": {
@@ -981,7 +981,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-check-es2015-constants": {
@@ -990,7 +990,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-syntax-async-functions": {
@@ -1065,9 +1065,9 @@
       "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-generators": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-generators": "^6.5.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-async-to-generator": {
@@ -1076,9 +1076,9 @@
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-class-constructor-call": {
@@ -1087,9 +1087,9 @@
       "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-class-constructor-call": "6.18.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-syntax-class-constructor-call": "^6.18.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-class-properties": {
@@ -1098,10 +1098,10 @@
       "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-plugin-syntax-class-properties": "6.13.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-plugin-syntax-class-properties": "^6.8.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-decorators": {
@@ -1110,11 +1110,11 @@
       "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
       "dev": true,
       "requires": {
-        "babel-helper-explode-class": "6.24.1",
-        "babel-plugin-syntax-decorators": "6.13.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-explode-class": "^6.24.1",
+        "babel-plugin-syntax-decorators": "^6.13.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -1123,7 +1123,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -1132,7 +1132,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -1141,11 +1141,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -1154,15 +1154,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "6.26.0",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -1171,8 +1171,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -1181,7 +1181,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -1190,8 +1190,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -1200,7 +1200,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -1209,9 +1209,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -1220,7 +1220,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -1229,9 +1229,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -1240,10 +1240,10 @@
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -1252,9 +1252,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -1263,9 +1263,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -1274,8 +1274,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.26.0"
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -1284,12 +1284,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -1298,8 +1298,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -1308,7 +1308,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -1317,9 +1317,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -1328,7 +1328,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -1337,7 +1337,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -1346,9 +1346,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "regexpu-core": "2.0.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
       }
     },
     "babel-plugin-transform-exponentiation-operator": {
@@ -1357,9 +1357,9 @@
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-export-extensions": {
@@ -1368,8 +1368,8 @@
       "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-export-extensions": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-export-extensions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-flow-strip-types": {
@@ -1378,8 +1378,8 @@
       "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-flow": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-flow": "^6.18.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-object-rest-spread": {
@@ -1388,8 +1388,8 @@
       "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-object-rest-spread": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+        "babel-runtime": "^6.26.0"
       }
     },
     "babel-plugin-transform-regenerator": {
@@ -1398,7 +1398,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.10.1"
+        "regenerator-transform": "^0.10.0"
       }
     },
     "babel-plugin-transform-strict-mode": {
@@ -1407,8 +1407,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-preset-env": {
@@ -1417,36 +1417,36 @@
       "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "3.2.7",
-        "invariant": "2.2.2",
-        "semver": "5.4.1"
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-to-generator": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
+        "babel-plugin-transform-es2015-classes": "^6.23.0",
+        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
+        "babel-plugin-transform-es2015-for-of": "^6.23.0",
+        "babel-plugin-transform-es2015-function-name": "^6.22.0",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
+        "babel-plugin-transform-es2015-object-super": "^6.22.0",
+        "babel-plugin-transform-es2015-parameters": "^6.23.0",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
+        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
+        "babel-plugin-transform-regenerator": "^6.22.0",
+        "browserslist": "^3.2.6",
+        "invariant": "^2.2.2",
+        "semver": "^5.3.0"
       },
       "dependencies": {
         "browserslist": {
@@ -1455,8 +1455,8 @@
           "integrity": "sha512-oYVLxFVqpX9uMhOIQBLtZL+CX4uY8ZpWcjNTaxyWl5rO8yA9SSNikFnAfvk8J3P/7z3BZwNmEqFKaJoYltj3MQ==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "1.0.30000842",
-            "electron-to-chromium": "1.3.47"
+            "caniuse-lite": "^1.0.30000835",
+            "electron-to-chromium": "^1.3.45"
           }
         },
         "electron-to-chromium": {
@@ -1473,30 +1473,30 @@
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0"
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
       }
     },
     "babel-preset-stage-1": {
@@ -1505,9 +1505,9 @@
       "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-class-constructor-call": "6.24.1",
-        "babel-plugin-transform-export-extensions": "6.22.0",
-        "babel-preset-stage-2": "6.24.1"
+        "babel-plugin-transform-class-constructor-call": "^6.24.1",
+        "babel-plugin-transform-export-extensions": "^6.22.0",
+        "babel-preset-stage-2": "^6.24.1"
       }
     },
     "babel-preset-stage-2": {
@@ -1516,10 +1516,10 @@
       "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-dynamic-import": "6.18.0",
-        "babel-plugin-transform-class-properties": "6.24.1",
-        "babel-plugin-transform-decorators": "6.24.1",
-        "babel-preset-stage-3": "6.24.1"
+        "babel-plugin-syntax-dynamic-import": "^6.18.0",
+        "babel-plugin-transform-class-properties": "^6.24.1",
+        "babel-plugin-transform-decorators": "^6.24.1",
+        "babel-preset-stage-3": "^6.24.1"
       }
     },
     "babel-preset-stage-3": {
@@ -1528,11 +1528,11 @@
       "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-generator-functions": "6.24.1",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-object-rest-spread": "6.26.0"
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-generator-functions": "^6.24.1",
+        "babel-plugin-transform-async-to-generator": "^6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "^6.24.1",
+        "babel-plugin-transform-object-rest-spread": "^6.22.0"
       }
     },
     "babel-register": {
@@ -1541,13 +1541,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.3",
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.5",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.18"
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
       }
     },
     "babel-runtime": {
@@ -1556,8 +1556,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
     "babel-template": {
@@ -1566,11 +1566,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash": "4.17.5"
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-traverse": {
@@ -1579,15 +1579,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "debug": "2.6.9",
-        "globals": "9.18.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.5"
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
       }
     },
     "babel-types": {
@@ -1596,10 +1596,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.5",
-        "to-fast-properties": "1.0.3"
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
       }
     },
     "babylon": {
@@ -1620,13 +1620,13 @@
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "cache-base": "1.0.1",
-        "class-utils": "0.3.6",
-        "component-emitter": "1.2.1",
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "mixin-deep": "1.3.1",
-        "pascalcase": "0.1.1"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -1635,7 +1635,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -1644,7 +1644,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -1653,7 +1653,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -1662,9 +1662,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -1687,7 +1687,7 @@
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
       "optional": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "big.js": {
@@ -1714,7 +1714,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "~2.0.0"
       }
     },
     "bluebird": {
@@ -1735,15 +1735,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "http-errors": "1.6.3",
+        "depd": "~1.1.1",
+        "http-errors": "~1.6.2",
         "iconv-lite": "0.4.19",
-        "on-finished": "2.3.0",
+        "on-finished": "~2.3.0",
         "qs": "6.5.1",
         "raw-body": "2.3.2",
-        "type-is": "1.6.16"
+        "type-is": "~1.6.15"
       },
       "dependencies": {
         "qs": {
@@ -1760,12 +1760,12 @@
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "array-flatten": "2.1.1",
-        "deep-equal": "1.0.1",
-        "dns-equal": "1.0.0",
-        "dns-txt": "2.0.2",
-        "multicast-dns": "6.2.3",
-        "multicast-dns-service-types": "1.1.0"
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
       }
     },
     "boolbase": {
@@ -1779,7 +1779,7 @@
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "2.x.x"
       }
     },
     "brace-expansion": {
@@ -1788,7 +1788,7 @@
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "dev": true,
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1798,16 +1798,16 @@
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "arr-flatten": "1.1.0",
-        "array-unique": "0.3.2",
-        "extend-shallow": "2.0.1",
-        "fill-range": "4.0.0",
-        "isobject": "3.0.1",
-        "repeat-element": "1.1.2",
-        "snapdragon": "0.8.2",
-        "snapdragon-node": "2.1.1",
-        "split-string": "3.1.0",
-        "to-regex": "3.0.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -1816,7 +1816,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -1833,12 +1833,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "1.0.3",
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "browserify-cipher": {
@@ -1847,9 +1847,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.2.0",
-        "browserify-des": "1.0.1",
-        "evp_bytestokey": "1.0.3"
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
       }
     },
     "browserify-des": {
@@ -1858,9 +1858,9 @@
       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "des.js": "1.0.0",
-        "inherits": "2.0.3"
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "browserify-rsa": {
@@ -1869,8 +1869,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "randombytes": "2.0.6"
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
       }
     },
     "browserify-sign": {
@@ -1879,13 +1879,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "elliptic": "6.4.0",
-        "inherits": "2.0.3",
-        "parse-asn1": "5.1.1"
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
       }
     },
     "browserify-zlib": {
@@ -1894,7 +1894,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "1.0.6"
+        "pako": "~1.0.5"
       }
     },
     "browserslist": {
@@ -1903,8 +1903,8 @@
       "integrity": "sha512-oYVLxFVqpX9uMhOIQBLtZL+CX4uY8ZpWcjNTaxyWl5rO8yA9SSNikFnAfvk8J3P/7z3BZwNmEqFKaJoYltj3MQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000842",
-        "electron-to-chromium": "1.3.47"
+        "caniuse-lite": "^1.0.30000835",
+        "electron-to-chromium": "^1.3.45"
       },
       "dependencies": {
         "electron-to-chromium": {
@@ -1920,7 +1920,7 @@
       "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.6.5.tgz",
       "integrity": "sha512-s8YwVh8LCd61Cddpb4ssZdGwHmAAranRS0zaMFtjjrkFY3xkK/mM9Tex8V4fTmi+S9btw9c80fCI4KDSFwW8ig==",
       "requires": {
-        "bulma": "0.6.2"
+        "bulma": "^0.6.2"
       },
       "dependencies": {
         "bulma": {
@@ -1936,9 +1936,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.3.0",
-        "ieee754": "1.1.11",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "buffer-crc32": {
@@ -1988,19 +1988,19 @@
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "chownr": "1.0.1",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "lru-cache": "4.1.1",
-        "mississippi": "2.0.0",
-        "mkdirp": "0.5.1",
-        "move-concurrently": "1.0.1",
-        "promise-inflight": "1.0.1",
-        "rimraf": "2.6.2",
-        "ssri": "5.3.0",
-        "unique-filename": "1.1.0",
-        "y18n": "4.0.0"
+        "bluebird": "^3.5.1",
+        "chownr": "^1.0.1",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.1.11",
+        "lru-cache": "^4.1.1",
+        "mississippi": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^5.2.4",
+        "unique-filename": "^1.1.0",
+        "y18n": "^4.0.0"
       },
       "dependencies": {
         "y18n": {
@@ -2017,15 +2017,15 @@
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "collection-visit": "1.0.0",
-        "component-emitter": "1.2.1",
-        "get-value": "2.0.6",
-        "has-value": "1.0.0",
-        "isobject": "3.0.1",
-        "set-value": "2.0.0",
-        "to-object-path": "0.3.0",
-        "union-value": "1.0.0",
-        "unset-value": "1.0.0"
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
       }
     },
     "cacheable-request": {
@@ -2055,9 +2055,9 @@
           "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
           "dev": true,
           "requires": {
-            "prepend-http": "2.0.0",
-            "query-string": "5.1.1",
-            "sort-keys": "2.0.0"
+            "prepend-http": "^2.0.0",
+            "query-string": "^5.0.1",
+            "sort-keys": "^2.0.0"
           }
         },
         "prepend-http": {
@@ -2072,9 +2072,9 @@
           "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
           "dev": true,
           "requires": {
-            "decode-uri-component": "0.2.0",
-            "object-assign": "4.1.1",
-            "strict-uri-encode": "1.1.0"
+            "decode-uri-component": "^0.2.0",
+            "object-assign": "^4.1.0",
+            "strict-uri-encode": "^1.0.0"
           }
         },
         "sort-keys": {
@@ -2083,7 +2083,7 @@
           "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
           "dev": true,
           "requires": {
-            "is-plain-obj": "1.1.0"
+            "is-plain-obj": "^1.0.0"
           }
         }
       }
@@ -2100,7 +2100,7 @@
       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
       "dev": true,
       "requires": {
-        "callsites": "0.2.0"
+        "callsites": "^0.2.0"
       }
     },
     "callsites": {
@@ -2121,8 +2121,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -2139,10 +2139,10 @@
       "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
       "dev": true,
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000820",
-        "lodash.memoize": "4.1.2",
-        "lodash.uniq": "4.5.0"
+        "browserslist": "^1.3.6",
+        "caniuse-db": "^1.0.30000529",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
       },
       "dependencies": {
         "browserslist": {
@@ -2151,8 +2151,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000820",
-            "electron-to-chromium": "1.3.40"
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
           }
         }
       }
@@ -2180,11 +2180,11 @@
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dev": true,
       "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       }
     },
     "chardet": {
@@ -2204,11 +2204,11 @@
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=",
       "requires": {
-        "css-select": "1.0.0",
-        "dom-serializer": "0.1.0",
-        "entities": "1.1.1",
-        "htmlparser2": "3.8.3",
-        "lodash": "3.10.1"
+        "css-select": "~1.0.0",
+        "dom-serializer": "~0.1.0",
+        "entities": "~1.1.1",
+        "htmlparser2": "~3.8.1",
+        "lodash": "^3.2.0"
       },
       "dependencies": {
         "lodash": {
@@ -2224,18 +2224,18 @@
       "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
       "dev": true,
       "requires": {
-        "anymatch": "2.0.0",
-        "async-each": "1.0.1",
-        "braces": "2.3.2",
-        "fsevents": "1.2.4",
-        "glob-parent": "3.1.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "4.0.0",
-        "normalize-path": "2.1.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0",
-        "upath": "1.1.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.0"
       }
     },
     "chownr": {
@@ -2262,8 +2262,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "circular-json": {
@@ -2278,7 +2278,7 @@
       "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3"
+        "chalk": "^1.1.3"
       }
     },
     "class-utils": {
@@ -2287,10 +2287,10 @@
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "define-property": "0.2.5",
-        "isobject": "3.0.1",
-        "static-extend": "0.1.2"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2299,7 +2299,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -2310,7 +2310,7 @@
       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
       "dev": true,
       "requires": {
-        "restore-cursor": "1.0.1"
+        "restore-cursor": "^1.0.1"
       }
     },
     "cli-spinners": {
@@ -2343,7 +2343,7 @@
       "dev": true,
       "requires": {
         "slice-ansi": "0.0.4",
-        "string-width": "1.0.2"
+        "string-width": "^1.0.1"
       }
     },
     "cli-width": {
@@ -2358,9 +2358,9 @@
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
@@ -2381,10 +2381,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "1.0.0",
-        "is-plain-object": "2.0.4",
-        "kind-of": "6.0.2",
-        "shallow-clone": "1.0.0"
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
       },
       "dependencies": {
         "for-own": {
@@ -2393,7 +2393,7 @@
           "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
           "dev": true,
           "requires": {
-            "for-in": "1.0.2"
+            "for-in": "^1.0.1"
           }
         },
         "kind-of": {
@@ -2410,7 +2410,7 @@
       "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
       "dev": true,
       "requires": {
-        "mimic-response": "1.0.0"
+        "mimic-response": "^1.0.0"
       }
     },
     "clone-stats": {
@@ -2425,9 +2425,9 @@
       "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "process-nextick-args": "2.0.0",
-        "readable-stream": "2.3.6"
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
       },
       "dependencies": {
         "process-nextick-args": {
@@ -2442,13 +2442,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "string_decoder": {
@@ -2457,7 +2457,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -2473,7 +2473,7 @@
       "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
+        "q": "^1.1.2"
       }
     },
     "code-point-at": {
@@ -2488,8 +2488,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "1.0.0",
-        "object-visit": "1.0.1"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
     "color": {
@@ -2498,9 +2498,9 @@
       "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
       "dev": true,
       "requires": {
-        "clone": "1.0.4",
-        "color-convert": "1.9.1",
-        "color-string": "0.3.0"
+        "clone": "^1.0.2",
+        "color-convert": "^1.3.0",
+        "color-string": "^0.3.0"
       }
     },
     "color-convert": {
@@ -2509,7 +2509,7 @@
       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "^1.1.1"
       }
     },
     "color-name": {
@@ -2524,7 +2524,7 @@
       "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "^1.0.0"
       }
     },
     "colormin": {
@@ -2533,9 +2533,9 @@
       "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
       "dev": true,
       "requires": {
-        "color": "0.11.4",
+        "color": "^0.11.0",
         "css-color-names": "0.0.4",
-        "has": "1.0.1"
+        "has": "^1.0.1"
       }
     },
     "colors": {
@@ -2549,7 +2549,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
@@ -2564,7 +2564,7 @@
       "integrity": "sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.18.0"
       }
     },
     "commondir": {
@@ -2585,7 +2585,7 @@
       "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
       "dev": true,
       "requires": {
-        "mime-db": "1.33.0"
+        "mime-db": ">= 1.33.0 < 2"
       },
       "dependencies": {
         "mime-db": {
@@ -2602,13 +2602,13 @@
       "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.4",
         "bytes": "3.0.0",
-        "compressible": "2.0.13",
+        "compressible": "~2.0.13",
         "debug": "2.6.9",
-        "on-headers": "1.0.1",
+        "on-headers": "~1.0.1",
         "safe-buffer": "5.1.1",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       }
     },
     "concat-map": {
@@ -2623,9 +2623,9 @@
       "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "typedarray": "0.0.6"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
     "connect-history-api-fallback": {
@@ -2640,7 +2640,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "0.1.4"
+        "date-now": "^0.1.4"
       }
     },
     "console-control-strings": {
@@ -2655,7 +2655,7 @@
       "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1"
+        "bluebird": "^3.1.1"
       }
     },
     "constants-browserify": {
@@ -2700,12 +2700,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "fs-write-stream-atomic": "1.0.10",
-        "iferr": "0.1.5",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2",
-        "run-queue": "1.0.3"
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
       }
     },
     "copy-descriptor": {
@@ -2731,13 +2731,13 @@
       "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
       "dev": true,
       "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.7.0",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.4.3",
+        "minimist": "^1.2.0",
+        "object-assign": "^4.1.0",
+        "os-homedir": "^1.0.1",
+        "parse-json": "^2.2.0",
+        "require-from-string": "^1.1.0"
       },
       "dependencies": {
         "minimist": {
@@ -2754,8 +2754,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "elliptic": "6.4.0"
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
       }
     },
     "create-hash": {
@@ -2764,11 +2764,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "md5.js": "1.3.4",
-        "ripemd160": "2.0.2",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
       }
     },
     "create-hmac": {
@@ -2777,12 +2777,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "cross-env": {
@@ -2791,8 +2791,8 @@
       "integrity": "sha512-GSiNTbvTU3pXzewRKGP0Y+rVP2CzifY2pqSEdtHzLLj41pRdkrgY7e4uSnBoR/pmYaqZr/lwwjg/Q4kNX30hWQ==",
       "dev": true,
       "requires": {
-        "cross-spawn": "5.1.0",
-        "is-windows": "1.0.2"
+        "cross-spawn": "^5.1.0",
+        "is-windows": "^1.0.0"
       }
     },
     "cross-spawn": {
@@ -2801,9 +2801,9 @@
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
-        "shebang-command": "1.2.0",
-        "which": "1.3.0"
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       }
     },
     "cryptiles": {
@@ -2812,7 +2812,7 @@
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
       "dev": true,
       "requires": {
-        "boom": "2.10.1"
+        "boom": "2.x.x"
       }
     },
     "crypto-browserify": {
@@ -2821,17 +2821,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "1.0.1",
-        "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.3",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "diffie-hellman": "5.0.3",
-        "inherits": "2.0.3",
-        "pbkdf2": "3.0.16",
-        "public-encrypt": "4.0.2",
-        "randombytes": "2.0.6",
-        "randomfill": "1.0.4"
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
       }
     },
     "css-color-names": {
@@ -2846,20 +2846,20 @@
       "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "css-selector-tokenizer": "0.7.0",
-        "cssnano": "3.10.0",
-        "icss-utils": "2.1.0",
-        "loader-utils": "1.1.0",
-        "lodash.camelcase": "4.3.0",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-modules-extract-imports": "1.2.0",
-        "postcss-modules-local-by-default": "1.2.0",
-        "postcss-modules-scope": "1.1.0",
-        "postcss-modules-values": "1.3.0",
-        "postcss-value-parser": "3.3.0",
-        "source-list-map": "2.0.0"
+        "babel-code-frame": "^6.26.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "cssnano": "^3.10.0",
+        "icss-utils": "^2.1.0",
+        "loader-utils": "^1.0.2",
+        "lodash.camelcase": "^4.3.0",
+        "object-assign": "^4.1.1",
+        "postcss": "^5.0.6",
+        "postcss-modules-extract-imports": "^1.2.0",
+        "postcss-modules-local-by-default": "^1.2.0",
+        "postcss-modules-scope": "^1.1.0",
+        "postcss-modules-values": "^1.3.0",
+        "postcss-value-parser": "^3.3.0",
+        "source-list-map": "^2.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -2874,10 +2874,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -2886,7 +2886,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -2896,10 +2896,10 @@
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
       "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=",
       "requires": {
-        "boolbase": "1.0.0",
-        "css-what": "1.0.0",
-        "domutils": "1.4.3",
-        "nth-check": "1.0.1"
+        "boolbase": "~1.0.0",
+        "css-what": "1.0",
+        "domutils": "1.4",
+        "nth-check": "~1.0.0"
       }
     },
     "css-selector-tokenizer": {
@@ -2908,9 +2908,9 @@
       "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
       "dev": true,
       "requires": {
-        "cssesc": "0.1.0",
-        "fastparse": "1.1.1",
-        "regexpu-core": "1.0.0"
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
       },
       "dependencies": {
         "regexpu-core": {
@@ -2919,9 +2919,9 @@
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
-            "regenerate": "1.3.3",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
           }
         }
       }
@@ -2943,38 +2943,38 @@
       "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
       "dev": true,
       "requires": {
-        "autoprefixer": "6.7.7",
-        "decamelize": "1.2.0",
-        "defined": "1.0.0",
-        "has": "1.0.1",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-calc": "5.3.1",
-        "postcss-colormin": "2.2.2",
-        "postcss-convert-values": "2.6.1",
-        "postcss-discard-comments": "2.0.4",
-        "postcss-discard-duplicates": "2.1.0",
-        "postcss-discard-empty": "2.1.0",
-        "postcss-discard-overridden": "0.1.1",
-        "postcss-discard-unused": "2.2.3",
-        "postcss-filter-plugins": "2.0.2",
-        "postcss-merge-idents": "2.1.7",
-        "postcss-merge-longhand": "2.0.2",
-        "postcss-merge-rules": "2.1.2",
-        "postcss-minify-font-values": "1.0.5",
-        "postcss-minify-gradients": "1.0.5",
-        "postcss-minify-params": "1.2.2",
-        "postcss-minify-selectors": "2.1.1",
-        "postcss-normalize-charset": "1.1.1",
-        "postcss-normalize-url": "3.0.8",
-        "postcss-ordered-values": "2.2.3",
-        "postcss-reduce-idents": "2.4.0",
-        "postcss-reduce-initial": "1.0.1",
-        "postcss-reduce-transforms": "1.0.4",
-        "postcss-svgo": "2.1.6",
-        "postcss-unique-selectors": "2.0.2",
-        "postcss-value-parser": "3.3.0",
-        "postcss-zindex": "2.2.0"
+        "autoprefixer": "^6.3.1",
+        "decamelize": "^1.1.2",
+        "defined": "^1.0.0",
+        "has": "^1.0.1",
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.14",
+        "postcss-calc": "^5.2.0",
+        "postcss-colormin": "^2.1.8",
+        "postcss-convert-values": "^2.3.4",
+        "postcss-discard-comments": "^2.0.4",
+        "postcss-discard-duplicates": "^2.0.1",
+        "postcss-discard-empty": "^2.0.1",
+        "postcss-discard-overridden": "^0.1.1",
+        "postcss-discard-unused": "^2.2.1",
+        "postcss-filter-plugins": "^2.0.0",
+        "postcss-merge-idents": "^2.1.5",
+        "postcss-merge-longhand": "^2.0.1",
+        "postcss-merge-rules": "^2.0.3",
+        "postcss-minify-font-values": "^1.0.2",
+        "postcss-minify-gradients": "^1.0.1",
+        "postcss-minify-params": "^1.0.4",
+        "postcss-minify-selectors": "^2.0.4",
+        "postcss-normalize-charset": "^1.1.0",
+        "postcss-normalize-url": "^3.0.7",
+        "postcss-ordered-values": "^2.1.0",
+        "postcss-reduce-idents": "^2.2.2",
+        "postcss-reduce-initial": "^1.0.0",
+        "postcss-reduce-transforms": "^1.0.3",
+        "postcss-svgo": "^2.1.1",
+        "postcss-unique-selectors": "^2.0.2",
+        "postcss-value-parser": "^3.2.3",
+        "postcss-zindex": "^2.0.1"
       },
       "dependencies": {
         "autoprefixer": {
@@ -2983,12 +2983,12 @@
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
           "dev": true,
           "requires": {
-            "browserslist": "1.7.7",
-            "caniuse-db": "1.0.30000820",
-            "normalize-range": "0.1.2",
-            "num2fraction": "1.2.2",
-            "postcss": "5.2.18",
-            "postcss-value-parser": "3.3.0"
+            "browserslist": "^1.7.6",
+            "caniuse-db": "^1.0.30000634",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "postcss": "^5.2.16",
+            "postcss-value-parser": "^3.2.3"
           }
         },
         "browserslist": {
@@ -2997,8 +2997,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000820",
-            "electron-to-chromium": "1.3.40"
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
           }
         },
         "has-flag": {
@@ -3013,10 +3013,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -3025,7 +3025,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -3036,8 +3036,8 @@
       "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
       "dev": true,
       "requires": {
-        "clap": "1.2.3",
-        "source-map": "0.5.7"
+        "clap": "^1.0.9",
+        "source-map": "^0.5.3"
       }
     },
     "currently-unhandled": {
@@ -3046,7 +3046,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "1.0.2"
+        "array-find-index": "^1.0.1"
       }
     },
     "cyclist": {
@@ -3105,8 +3105,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
           }
         },
         "ansi-styles": {
@@ -3115,7 +3115,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "bluebird": {
@@ -3136,9 +3136,9 @@
           "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
+            "ansi-styles": "^3.1.0",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^4.0.0"
           },
           "dependencies": {
             "supports-color": {
@@ -3147,7 +3147,7 @@
               "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
               "dev": true,
               "requires": {
-                "has-flag": "2.0.0"
+                "has-flag": "^2.0.0"
               }
             }
           }
@@ -3173,8 +3173,8 @@
           "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
           "dev": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "ajv": "^4.9.1",
+            "har-schema": "^1.0.5"
           }
         },
         "has-flag": {
@@ -3207,28 +3207,28 @@
           "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
           "dev": true,
           "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.6",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.17",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.1.1",
-            "stringstream": "0.0.6",
-            "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.2.1"
+            "aws-sign2": "~0.6.0",
+            "aws4": "^1.2.1",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.1.1",
+            "har-validator": "~4.2.1",
+            "hawk": "~3.1.3",
+            "http-signature": "~1.1.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.7",
+            "oauth-sign": "~0.8.1",
+            "performance-now": "^0.2.0",
+            "qs": "~6.4.0",
+            "safe-buffer": "^5.0.1",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.3.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.0.0"
           }
         },
         "supports-color": {
@@ -3237,7 +3237,7 @@
           "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "^2.0.0"
           }
         },
         "tunnel-agent": {
@@ -3246,7 +3246,7 @@
           "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "^5.0.1"
           }
         }
       }
@@ -3257,7 +3257,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.42"
+        "es5-ext": "^0.10.9"
       }
     },
     "dargs": {
@@ -3271,7 +3271,7 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -3332,7 +3332,7 @@
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dev": true,
       "requires": {
-        "mimic-response": "1.0.0"
+        "mimic-response": "^1.0.0"
       }
     },
     "deep-equal": {
@@ -3359,8 +3359,8 @@
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "dev": true,
       "requires": {
-        "foreach": "2.0.5",
-        "object-keys": "1.0.11"
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
       }
     },
     "define-property": {
@@ -3369,8 +3369,8 @@
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "1.0.2",
-        "isobject": "3.0.1"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -3379,7 +3379,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -3388,7 +3388,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -3397,9 +3397,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -3416,12 +3416,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "6.1.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "p-map": "1.2.0",
-        "pify": "3.0.0",
-        "rimraf": "2.6.2"
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
       },
       "dependencies": {
         "pify": {
@@ -3455,8 +3455,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "destroy": {
@@ -3477,7 +3477,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "detect-node": {
@@ -3498,9 +3498,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "miller-rabin": "4.0.1",
-        "randombytes": "2.0.6"
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
       }
     },
     "dir-glob": {
@@ -3509,8 +3509,8 @@
       "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
-        "arrify": "1.0.1",
-        "path-type": "3.0.0"
+        "arrify": "^1.0.1",
+        "path-type": "^3.0.0"
       },
       "dependencies": {
         "path-type": {
@@ -3519,7 +3519,7 @@
           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
-            "pify": "3.0.0"
+            "pify": "^3.0.0"
           }
         },
         "pify": {
@@ -3542,8 +3542,8 @@
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
-        "ip": "1.1.5",
-        "safe-buffer": "5.1.1"
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
       }
     },
     "dns-txt": {
@@ -3552,7 +3552,7 @@
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
-        "buffer-indexof": "1.1.1"
+        "buffer-indexof": "^1.0.0"
       }
     },
     "doctrine": {
@@ -3561,7 +3561,7 @@
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2"
+        "esutils": "^2.0.2"
       }
     },
     "dom-serializer": {
@@ -3569,8 +3569,8 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "requires": {
-        "domelementtype": "1.1.3",
-        "entities": "1.1.1"
+        "domelementtype": "~1.1.1",
+        "entities": "~1.1.1"
       },
       "dependencies": {
         "domelementtype": {
@@ -3596,7 +3596,7 @@
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
       "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
       "requires": {
-        "domelementtype": "1.3.0"
+        "domelementtype": "1"
       }
     },
     "domutils": {
@@ -3604,7 +3604,7 @@
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
       "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=",
       "requires": {
-        "domelementtype": "1.3.0"
+        "domelementtype": "1"
       }
     },
     "dot-prop": {
@@ -3613,7 +3613,7 @@
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
-        "is-obj": "1.0.1"
+        "is-obj": "^1.0.0"
       }
     },
     "duplexer3": {
@@ -3628,10 +3628,10 @@
       "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "ecc-jsbn": {
@@ -3640,7 +3640,7 @@
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
       "optional": true,
       "requires": {
-        "jsbn": "0.1.1"
+        "jsbn": "~0.1.0"
       }
     },
     "editions": {
@@ -3685,13 +3685,13 @@
       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.3",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "emojis-list": {
@@ -3712,7 +3712,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.4.0"
       }
     },
     "enhanced-resolve": {
@@ -3721,9 +3721,9 @@
       "integrity": "sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.4.1",
-        "tapable": "1.0.0"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
       }
     },
     "entities": {
@@ -3743,7 +3743,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "1.0.1"
+        "prr": "~1.0.1"
       }
     },
     "error": {
@@ -3752,8 +3752,8 @@
       "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
       "dev": true,
       "requires": {
-        "string-template": "0.2.1",
-        "xtend": "4.0.1"
+        "string-template": "~0.2.1",
+        "xtend": "~4.0.0"
       }
     },
     "error-ex": {
@@ -3762,7 +3762,7 @@
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "dev": true,
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
@@ -3771,11 +3771,11 @@
       "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "1.1.1",
-        "function-bind": "1.1.1",
-        "has": "1.0.1",
-        "is-callable": "1.1.3",
-        "is-regex": "1.0.4"
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
       }
     },
     "es-to-primitive": {
@@ -3784,9 +3784,9 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.3",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.1"
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
       }
     },
     "es5-ext": {
@@ -3795,9 +3795,9 @@
       "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1",
-        "next-tick": "1.0.0"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "1"
       }
     },
     "es6-iterator": {
@@ -3806,9 +3806,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.42",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
       }
     },
     "es6-symbol": {
@@ -3817,8 +3817,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.42"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "escape-html": {
@@ -3839,44 +3839,44 @@
       "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
       "dev": true,
       "requires": {
-        "ajv": "5.5.2",
-        "babel-code-frame": "6.26.0",
-        "chalk": "2.3.2",
-        "concat-stream": "1.6.0",
-        "cross-spawn": "5.1.0",
-        "debug": "3.1.0",
-        "doctrine": "2.1.0",
-        "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.4",
-        "esquery": "1.0.0",
-        "esutils": "2.0.2",
-        "file-entry-cache": "2.0.0",
-        "functional-red-black-tree": "1.0.1",
-        "glob": "7.1.2",
-        "globals": "11.3.0",
-        "ignore": "3.3.7",
-        "imurmurhash": "0.1.4",
-        "inquirer": "3.3.0",
-        "is-resolvable": "1.1.0",
-        "js-yaml": "3.11.0",
-        "json-stable-stringify-without-jsonify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.5",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "pluralize": "7.0.0",
-        "progress": "2.0.0",
-        "regexpp": "1.0.1",
-        "require-uncached": "1.0.3",
-        "semver": "5.4.1",
-        "strip-ansi": "4.0.0",
-        "strip-json-comments": "2.0.1",
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.4",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
         "table": "4.0.2",
-        "text-table": "0.2.0"
+        "text-table": "~0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3891,7 +3891,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -3900,9 +3900,9 @@
           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "debug": {
@@ -3938,8 +3938,8 @@
           "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
           "dev": true,
           "requires": {
-            "argparse": "1.0.9",
-            "esprima": "4.0.0"
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
           }
         },
         "progress": {
@@ -3954,7 +3954,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -3963,7 +3963,7 @@
           "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -3974,11 +3974,11 @@
       "integrity": "sha512-VxxGDI4bXzLk0+/jMt/0EkGMRKS9ox6Czx+yapMb9WJmcS/ZHhlhqcVUNgUjFBNp02j/2pZLdGOrG7EXyjoz/g==",
       "dev": true,
       "requires": {
-        "loader-fs-cache": "1.0.1",
-        "loader-utils": "1.1.0",
-        "object-assign": "4.1.1",
-        "object-hash": "1.3.0",
-        "rimraf": "2.6.2"
+        "loader-fs-cache": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "object-assign": "^4.0.1",
+        "object-hash": "^1.1.4",
+        "rimraf": "^2.6.1"
       },
       "dependencies": {
         "loader-utils": {
@@ -3987,9 +3987,9 @@
           "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
           "dev": true,
           "requires": {
-            "big.js": "3.2.0",
-            "emojis-list": "2.1.0",
-            "json5": "0.5.1"
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0"
           }
         }
       }
@@ -4000,7 +4000,7 @@
       "integrity": "sha512-2CDidjAZ875tbJgtjKihIQRkqxgk3gVUDOAW2e9dP+Kf39jhCwKy6aMXIsHRKCPjRqQhDWF0jtVRNcywBFWTZA==",
       "dev": true,
       "requires": {
-        "vue-eslint-parser": "2.0.3"
+        "vue-eslint-parser": "^2.0.3"
       }
     },
     "eslint-scope": {
@@ -4009,8 +4009,8 @@
       "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "esrecurse": "4.2.0",
-        "estraverse": "4.2.0"
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       }
     },
     "eslint-visitor-keys": {
@@ -4025,8 +4025,8 @@
       "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
       "dev": true,
       "requires": {
-        "acorn": "5.5.3",
-        "acorn-jsx": "3.0.1"
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
       },
       "dependencies": {
         "acorn": {
@@ -4049,7 +4049,7 @@
       "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0"
+        "estraverse": "^4.0.0"
       }
     },
     "esrecurse": {
@@ -4058,8 +4058,8 @@
       "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
+        "estraverse": "^4.1.0",
+        "object-assign": "^4.0.1"
       }
     },
     "estraverse": {
@@ -4098,7 +4098,7 @@
       "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
       "dev": true,
       "requires": {
-        "original": "1.0.1"
+        "original": ">=0.0.5"
       }
     },
     "evp_bytestokey": {
@@ -4107,8 +4107,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "1.3.4",
-        "safe-buffer": "5.1.1"
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
       }
     },
     "execa": {
@@ -4117,13 +4117,13 @@
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       }
     },
     "exit-hook": {
@@ -4138,13 +4138,13 @@
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "posix-character-classes": "0.1.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -4153,7 +4153,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -4162,7 +4162,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -4173,7 +4173,7 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "2.2.4"
+        "fill-range": "^2.1.0"
       },
       "dependencies": {
         "fill-range": {
@@ -4182,11 +4182,11 @@
           "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
-            "is-number": "2.1.0",
-            "isobject": "2.1.0",
-            "randomatic": "3.0.0",
-            "repeat-element": "1.1.2",
-            "repeat-string": "1.6.1"
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
           }
         },
         "is-number": {
@@ -4195,7 +4195,7 @@
           "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
           "dev": true,
           "requires": {
-            "kind-of": "3.2.2"
+            "kind-of": "^3.0.2"
           }
         },
         "isobject": {
@@ -4213,7 +4213,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -4224,7 +4224,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.1"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "express": {
@@ -4233,36 +4233,36 @@
       "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
         "finalhandler": "1.1.1",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.3",
+        "proxy-addr": "~2.0.3",
         "qs": "6.5.1",
-        "range-parser": "1.2.0",
+        "range-parser": "~1.2.0",
         "safe-buffer": "5.1.1",
         "send": "0.16.2",
         "serve-static": "1.13.2",
         "setprototypeof": "1.1.0",
-        "statuses": "1.4.0",
-        "type-is": "1.6.16",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
         "utils-merge": "1.0.1",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       },
       "dependencies": {
         "array-flatten": {
@@ -4290,8 +4290,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "1.0.0",
-        "is-extendable": "1.0.1"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -4300,7 +4300,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -4311,9 +4311,9 @@
       "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
       "dev": true,
       "requires": {
-        "chardet": "0.4.2",
-        "iconv-lite": "0.4.19",
-        "tmp": "0.0.33"
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
       },
       "dependencies": {
         "tmp": {
@@ -4322,7 +4322,7 @@
           "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
           "dev": true,
           "requires": {
-            "os-tmpdir": "1.0.2"
+            "os-tmpdir": "~1.0.2"
           }
         }
       }
@@ -4333,14 +4333,14 @@
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "array-unique": "0.3.2",
-        "define-property": "1.0.0",
-        "expand-brackets": "2.1.4",
-        "extend-shallow": "2.0.1",
-        "fragment-cache": "0.2.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -4349,7 +4349,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "extend-shallow": {
@@ -4358,7 +4358,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "is-accessor-descriptor": {
@@ -4367,7 +4367,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -4376,7 +4376,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -4385,9 +4385,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -4419,7 +4419,7 @@
           "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
           "dev": true,
           "requires": {
-            "fd-slicer": "1.0.1"
+            "fd-slicer": "~1.0.1"
           }
         }
       }
@@ -4440,11 +4440,11 @@
       "integrity": "sha512-wSyW1TBK3ia5V+te0rGPXudeMHoUQW6O5Y9oATiaGhpENmEifPDlOdhpsnlj5HoG6ttIvGiY1DdCmI9X2xGMhg==",
       "dev": true,
       "requires": {
-        "@mrmlnc/readdir-enhanced": "2.2.1",
-        "glob-parent": "3.1.0",
-        "is-glob": "4.0.0",
-        "merge2": "1.2.2",
-        "micromatch": "3.1.10"
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.1",
+        "micromatch": "^3.1.10"
       }
     },
     "fast-json-stable-stringify": {
@@ -4470,7 +4470,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": "0.7.0"
+        "websocket-driver": ">=0.5.1"
       }
     },
     "fd-slicer": {
@@ -4479,7 +4479,7 @@
       "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
       "dev": true,
       "requires": {
-        "pend": "1.2.0"
+        "pend": "~1.2.0"
       }
     },
     "figures": {
@@ -4488,8 +4488,8 @@
       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5",
-        "object-assign": "4.1.1"
+        "escape-string-regexp": "^1.0.5",
+        "object-assign": "^4.1.0"
       }
     },
     "file-entry-cache": {
@@ -4498,8 +4498,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "1.3.0",
-        "object-assign": "4.1.1"
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
       }
     },
     "file-loader": {
@@ -4508,8 +4508,8 @@
       "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.4.5"
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^0.4.5"
       }
     },
     "filename-regex": {
@@ -4524,10 +4524,10 @@
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1",
-        "to-regex-range": "2.1.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -4536,7 +4536,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -4548,12 +4548,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.4.0",
-        "unpipe": "1.0.0"
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
       }
     },
     "find-cache-dir": {
@@ -4562,9 +4562,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "make-dir": "1.1.0",
-        "pkg-dir": "2.0.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
       }
     },
     "find-up": {
@@ -4573,8 +4573,8 @@
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "dev": true,
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "first-chunk-stream": {
@@ -4583,7 +4583,7 @@
       "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "^2.0.2"
       }
     },
     "flat-cache": {
@@ -4592,10 +4592,10 @@
       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
+        "circular-json": "^0.3.1",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
       },
       "dependencies": {
         "del": {
@@ -4604,13 +4604,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "5.0.0",
-            "is-path-cwd": "1.0.0",
-            "is-path-in-cwd": "1.0.0",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1",
-            "rimraf": "2.6.2"
+            "globby": "^5.0.0",
+            "is-path-cwd": "^1.0.0",
+            "is-path-in-cwd": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0",
+            "rimraf": "^2.2.8"
           }
         },
         "globby": {
@@ -4619,12 +4619,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "1.0.2",
-            "arrify": "1.0.1",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
+            "array-union": "^1.0.1",
+            "arrify": "^1.0.0",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           }
         }
       }
@@ -4647,8 +4647,8 @@
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.4"
       }
     },
     "follow-redirects": {
@@ -4656,7 +4656,7 @@
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz",
       "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==",
       "requires": {
-        "debug": "3.1.0"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -4681,7 +4681,7 @@
       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2"
+        "for-in": "^1.0.1"
       }
     },
     "foreach": {
@@ -4701,9 +4701,9 @@
       "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
       "dev": true,
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "2.1.17"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.5",
+        "mime-types": "^2.1.12"
       }
     },
     "forwarded": {
@@ -4718,7 +4718,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "0.2.2"
+        "map-cache": "^0.2.2"
       }
     },
     "fresh": {
@@ -4733,8 +4733,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
       }
     },
     "fs-extra": {
@@ -4743,9 +4743,9 @@
       "integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^3.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs-write-stream-atomic": {
@@ -4754,10 +4754,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "iferr": "0.1.5",
-        "imurmurhash": "0.1.4",
-        "readable-stream": "2.3.3"
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
       }
     },
     "fs.realpath": {
@@ -4773,8 +4773,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.10.0",
-        "node-pre-gyp": "0.10.0"
+        "nan": "^2.9.2",
+        "node-pre-gyp": "^0.10.0"
       },
       "dependencies": {
         "abbrev": {
@@ -4800,8 +4800,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           }
         },
         "balanced-match": {
@@ -4814,7 +4814,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "1.0.0",
+            "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -4878,7 +4878,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "2.2.4"
+            "minipass": "^2.2.1"
           }
         },
         "fs.realpath": {
@@ -4893,14 +4893,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
           }
         },
         "glob": {
@@ -4909,12 +4909,12 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "has-unicode": {
@@ -4929,7 +4929,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "2.1.2"
+            "safer-buffer": "^2.1.0"
           }
         },
         "ignore-walk": {
@@ -4938,7 +4938,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minimatch": "3.0.4"
+            "minimatch": "^3.0.4"
           }
         },
         "inflight": {
@@ -4947,8 +4947,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
@@ -4967,7 +4967,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "isarray": {
@@ -4981,7 +4981,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.11"
+            "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
@@ -4994,8 +4994,8 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1",
-            "yallist": "3.0.2"
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.0"
           }
         },
         "minizlib": {
@@ -5004,7 +5004,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "2.2.4"
+            "minipass": "^2.2.1"
           }
         },
         "mkdirp": {
@@ -5027,9 +5027,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "2.6.9",
-            "iconv-lite": "0.4.21",
-            "sax": "1.2.4"
+            "debug": "^2.1.2",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
@@ -5038,16 +5038,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "detect-libc": "1.0.3",
-            "mkdirp": "0.5.1",
-            "needle": "2.2.0",
-            "nopt": "4.0.1",
-            "npm-packlist": "1.1.10",
-            "npmlog": "4.1.2",
-            "rc": "1.2.7",
-            "rimraf": "2.6.2",
-            "semver": "5.5.0",
-            "tar": "4.4.1"
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.0",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
           }
         },
         "nopt": {
@@ -5056,8 +5056,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
         "npm-bundled": {
@@ -5072,8 +5072,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.3"
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
           }
         },
         "npmlog": {
@@ -5082,10 +5082,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
           }
         },
         "number-is-nan": {
@@ -5104,7 +5104,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "os-homedir": {
@@ -5125,8 +5125,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
           }
         },
         "path-is-absolute": {
@@ -5147,10 +5147,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.5.1",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -5167,13 +5167,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "rimraf": {
@@ -5182,7 +5182,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "7.1.2"
+            "glob": "^7.0.5"
           }
         },
         "safe-buffer": {
@@ -5225,9 +5225,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "string_decoder": {
@@ -5236,7 +5236,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         },
         "strip-ansi": {
@@ -5244,7 +5244,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
@@ -5259,13 +5259,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "1.0.1",
-            "fs-minipass": "1.2.5",
-            "minipass": "2.2.4",
-            "minizlib": "1.1.0",
-            "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.1",
-            "yallist": "3.0.2"
+            "chownr": "^1.0.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.2.4",
+            "minizlib": "^1.1.0",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.2"
           }
         },
         "util-deprecate": {
@@ -5280,7 +5280,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2"
           }
         },
         "wrappy": {
@@ -5301,10 +5301,10 @@
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
       }
     },
     "function-bind": {
@@ -5325,14 +5325,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
       }
     },
     "gaze": {
@@ -5341,7 +5341,7 @@
       "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
       "dev": true,
       "requires": {
-        "globule": "1.2.0"
+        "globule": "^1.0.0"
       }
     },
     "generate-function": {
@@ -5356,7 +5356,7 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "1.0.2"
+        "is-property": "^1.0.0"
       }
     },
     "get-caller-file": {
@@ -5398,7 +5398,7 @@
           "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=",
           "dev": true,
           "requires": {
-            "lodash": "4.17.5"
+            "lodash": "^4.14.0"
           }
         }
       }
@@ -5408,7 +5408,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -5424,8 +5424,8 @@
       "integrity": "sha512-F/mS+fsWQMo1zfgG9MD8KWvTWPPzzhuVwY++fhQ5Ggd+0P+CAMHtzMZhNxG+TqGfHDChJKsbh6otfMGqO2AKBw==",
       "dev": true,
       "requires": {
-        "got": "7.1.0",
-        "is-plain-obj": "1.1.0"
+        "got": "^7.0.0",
+        "is-plain-obj": "^1.1.0"
       },
       "dependencies": {
         "got": {
@@ -5434,20 +5434,20 @@
           "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
           "dev": true,
           "requires": {
-            "decompress-response": "3.3.0",
-            "duplexer3": "0.1.4",
-            "get-stream": "3.0.0",
-            "is-plain-obj": "1.1.0",
-            "is-retry-allowed": "1.1.0",
-            "is-stream": "1.1.0",
-            "isurl": "1.0.0",
-            "lowercase-keys": "1.0.1",
-            "p-cancelable": "0.3.0",
-            "p-timeout": "1.2.1",
-            "safe-buffer": "5.1.1",
-            "timed-out": "4.0.1",
-            "url-parse-lax": "1.0.0",
-            "url-to-options": "1.0.1"
+            "decompress-response": "^3.2.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-plain-obj": "^1.1.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "isurl": "^1.0.0-alpha5",
+            "lowercase-keys": "^1.0.0",
+            "p-cancelable": "^0.3.0",
+            "p-timeout": "^1.1.1",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "url-parse-lax": "^1.0.0",
+            "url-to-options": "^1.0.1"
           }
         },
         "p-cancelable": {
@@ -5462,7 +5462,7 @@
           "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
           "dev": true,
           "requires": {
-            "p-finally": "1.0.0"
+            "p-finally": "^1.0.0"
           }
         },
         "url-parse-lax": {
@@ -5471,7 +5471,7 @@
           "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
           "dev": true,
           "requires": {
-            "prepend-http": "1.0.4"
+            "prepend-http": "^1.0.1"
           }
         }
       }
@@ -5482,7 +5482,7 @@
       "integrity": "sha1-y+KABBiDIG2kISrp5LXxacML9Bc=",
       "dev": true,
       "requires": {
-        "gh-got": "6.0.0"
+        "gh-got": "^6.0.0"
       }
     },
     "glob": {
@@ -5491,12 +5491,12 @@
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "dev": true,
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "glob-all": {
@@ -5505,8 +5505,8 @@
       "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "yargs": "1.2.6"
+        "glob": "^7.0.5",
+        "yargs": "~1.2.6"
       },
       "dependencies": {
         "minimist": {
@@ -5521,7 +5521,7 @@
           "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=",
           "dev": true,
           "requires": {
-            "minimist": "0.1.0"
+            "minimist": "^0.1.0"
           }
         }
       }
@@ -5532,8 +5532,8 @@
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
       "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
       },
       "dependencies": {
         "glob-parent": {
@@ -5542,7 +5542,7 @@
           "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
           "dev": true,
           "requires": {
-            "is-glob": "2.0.1"
+            "is-glob": "^2.0.0"
           }
         },
         "is-extglob": {
@@ -5557,7 +5557,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "^1.0.0"
           }
         }
       }
@@ -5568,8 +5568,8 @@
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "3.1.0",
-        "path-dirname": "1.0.2"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
       },
       "dependencies": {
         "is-glob": {
@@ -5578,7 +5578,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "is-extglob": "^2.1.0"
           }
         }
       }
@@ -5595,7 +5595,7 @@
       "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
       "dev": true,
       "requires": {
-        "ini": "1.3.5"
+        "ini": "^1.3.4"
       }
     },
     "global-modules": {
@@ -5604,9 +5604,9 @@
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "1.0.2",
-        "is-windows": "1.0.2",
-        "resolve-dir": "1.0.1"
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
       }
     },
     "global-prefix": {
@@ -5615,11 +5615,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "homedir-polyfill": "1.0.1",
-        "ini": "1.3.5",
-        "is-windows": "1.0.2",
-        "which": "1.3.0"
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
       }
     },
     "globals": {
@@ -5634,11 +5634,11 @@
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "globule": {
@@ -5647,9 +5647,9 @@
       "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.5",
-        "minimatch": "3.0.4"
+        "glob": "~7.1.1",
+        "lodash": "~4.17.4",
+        "minimatch": "~3.0.2"
       }
     },
     "got": {
@@ -5658,23 +5658,23 @@
       "integrity": "sha512-tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w==",
       "dev": true,
       "requires": {
-        "@sindresorhus/is": "0.7.0",
-        "cacheable-request": "2.1.4",
-        "decompress-response": "3.3.0",
-        "duplexer3": "0.1.4",
-        "get-stream": "3.0.0",
-        "into-stream": "3.1.0",
-        "is-retry-allowed": "1.1.0",
-        "isurl": "1.0.0",
-        "lowercase-keys": "1.0.1",
-        "mimic-response": "1.0.0",
-        "p-cancelable": "0.4.1",
-        "p-timeout": "2.0.1",
-        "pify": "3.0.0",
-        "safe-buffer": "5.1.1",
-        "timed-out": "4.0.1",
-        "url-parse-lax": "3.0.0",
-        "url-to-options": "1.0.1"
+        "@sindresorhus/is": "^0.7.0",
+        "cacheable-request": "^2.1.1",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "into-stream": "^3.1.0",
+        "is-retry-allowed": "^1.1.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "mimic-response": "^1.0.0",
+        "p-cancelable": "^0.4.0",
+        "p-timeout": "^2.0.1",
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1",
+        "timed-out": "^4.0.1",
+        "url-parse-lax": "^3.0.0",
+        "url-to-options": "^1.0.1"
       },
       "dependencies": {
         "pify": {
@@ -5697,7 +5697,7 @@
       "integrity": "sha1-wWfSpTGcWg4JZO9qJbfC34mWyFw=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.5"
+        "lodash": "^4.17.2"
       }
     },
     "handle-thing": {
@@ -5717,8 +5717,8 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "5.5.2",
-        "har-schema": "2.0.0"
+        "ajv": "^5.1.0",
+        "har-schema": "^2.0.0"
       },
       "dependencies": {
         "har-schema": {
@@ -5734,7 +5734,7 @@
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.1"
+        "function-bind": "^1.0.2"
       }
     },
     "has-ansi": {
@@ -5743,7 +5743,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "has-color": {
@@ -5776,7 +5776,7 @@
       "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
       "dev": true,
       "requires": {
-        "has-symbol-support-x": "1.4.2"
+        "has-symbol-support-x": "^1.4.1"
       }
     },
     "has-unicode": {
@@ -5791,9 +5791,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "2.0.6",
-        "has-values": "1.0.0",
-        "isobject": "3.0.1"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
     "has-values": {
@@ -5802,8 +5802,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -5812,7 +5812,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5823,8 +5823,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "hash-sum": {
@@ -5839,8 +5839,8 @@
       "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "hawk": {
@@ -5849,10 +5849,10 @@
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
       "dev": true,
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "2.x.x",
+        "cryptiles": "2.x.x",
+        "hoek": "2.x.x",
+        "sntp": "1.x.x"
       }
     },
     "he": {
@@ -5867,9 +5867,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "1.1.3",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
     "hoek": {
@@ -5884,8 +5884,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
       }
     },
     "homedir-polyfill": {
@@ -5894,7 +5894,7 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "1.0.0"
+        "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
@@ -5909,10 +5909,10 @@
       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "obuf": "1.1.2",
-        "readable-stream": "2.3.3",
-        "wbuf": "1.7.3"
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
       }
     },
     "html-comment-regex": {
@@ -5932,10 +5932,10 @@
       "resolved": "https://registry.npmjs.org/html-to-json/-/html-to-json-0.6.0.tgz",
       "integrity": "sha1-cY2ylfPeCpJi1FKPrBqFg35uBrE=",
       "requires": {
-        "bluebird": "3.5.1",
-        "cheerio": "0.19.0",
-        "lodash": "3.10.1",
-        "request": "2.87.0"
+        "bluebird": "^3.0.6",
+        "cheerio": "^0.19.0",
+        "lodash": "^3.10.1",
+        "request": "^2.67.0"
       },
       "dependencies": {
         "lodash": {
@@ -5950,11 +5950,11 @@
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
       "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
       "requires": {
-        "domelementtype": "1.3.0",
-        "domhandler": "2.3.0",
-        "domutils": "1.5.1",
-        "entities": "1.0.0",
-        "readable-stream": "1.1.14"
+        "domelementtype": "1",
+        "domhandler": "2.3",
+        "domutils": "1.5",
+        "entities": "1.0",
+        "readable-stream": "1.1"
       },
       "dependencies": {
         "domutils": {
@@ -5962,8 +5962,8 @@
           "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
           "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
           "requires": {
-            "dom-serializer": "0.1.0",
-            "domelementtype": "1.3.0"
+            "dom-serializer": "0",
+            "domelementtype": "1"
           }
         },
         "entities": {
@@ -5981,10 +5981,10 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         },
         "string_decoder": {
@@ -6012,10 +6012,10 @@
       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "dev": true,
       "requires": {
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "inherits": "2.0.3",
         "setprototypeof": "1.1.0",
-        "statuses": "1.4.0"
+        "statuses": ">= 1.4.0 < 2"
       }
     },
     "http-parser-js": {
@@ -6030,9 +6030,9 @@
       "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "3.1.0",
-        "follow-redirects": "1.4.1",
-        "requires-port": "1.0.0"
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "http-proxy-middleware": {
@@ -6041,10 +6041,10 @@
       "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "1.17.0",
-        "is-glob": "4.0.0",
-        "lodash": "4.17.5",
-        "micromatch": "3.1.10"
+        "http-proxy": "^1.16.2",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.5",
+        "micromatch": "^3.1.9"
       }
     },
     "http-signature": {
@@ -6053,9 +6053,9 @@
       "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
       "dev": true,
       "requires": {
-        "assert-plus": "0.2.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.14.1"
+        "assert-plus": "^0.2.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
     "https-browserify": {
@@ -6082,7 +6082,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.21"
+        "postcss": "^6.0.1"
       }
     },
     "ieee754": {
@@ -6109,8 +6109,8 @@
       "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "2.0.0",
-        "resolve-cwd": "2.0.0"
+        "pkg-dir": "^2.0.0",
+        "resolve-cwd": "^2.0.0"
       }
     },
     "imurmurhash": {
@@ -6131,7 +6131,7 @@
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "indexes-of": {
@@ -6152,8 +6152,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -6173,20 +6173,20 @@
       "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "3.0.0",
-        "chalk": "2.3.2",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "2.1.0",
-        "figures": "2.0.0",
-        "lodash": "4.17.5",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
         "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rx-lite": "4.0.8",
-        "rx-lite-aggregates": "4.0.8",
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0",
-        "through": "2.3.8"
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-escapes": {
@@ -6207,7 +6207,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -6216,9 +6216,9 @@
           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "cli-cursor": {
@@ -6227,7 +6227,7 @@
           "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
           "dev": true,
           "requires": {
-            "restore-cursor": "2.0.0"
+            "restore-cursor": "^2.0.0"
           }
         },
         "figures": {
@@ -6236,7 +6236,7 @@
           "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5"
+            "escape-string-regexp": "^1.0.5"
           }
         },
         "has-flag": {
@@ -6257,7 +6257,7 @@
           "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
           "dev": true,
           "requires": {
-            "mimic-fn": "1.1.0"
+            "mimic-fn": "^1.0.0"
           }
         },
         "restore-cursor": {
@@ -6266,8 +6266,8 @@
           "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
           "dev": true,
           "requires": {
-            "onetime": "2.0.1",
-            "signal-exit": "3.0.2"
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
           }
         },
         "string-width": {
@@ -6276,8 +6276,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -6286,7 +6286,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -6295,7 +6295,7 @@
           "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -6306,7 +6306,7 @@
       "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
       "dev": true,
       "requires": {
-        "meow": "3.7.0"
+        "meow": "^3.3.0"
       }
     },
     "interpret": {
@@ -6321,8 +6321,8 @@
       "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
       "dev": true,
       "requires": {
-        "from2": "2.3.0",
-        "p-is-promise": "1.1.0"
+        "from2": "^2.1.1",
+        "p-is-promise": "^1.1.0"
       }
     },
     "invariant": {
@@ -6331,7 +6331,7 @@
       "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
       "dev": true,
       "requires": {
-        "loose-envify": "1.3.1"
+        "loose-envify": "^1.0.0"
       }
     },
     "invert-kv": {
@@ -6364,7 +6364,7 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -6373,7 +6373,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -6390,7 +6390,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.11.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-buffer": {
@@ -6404,7 +6404,7 @@
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
-        "builtin-modules": "1.1.1"
+        "builtin-modules": "^1.0.0"
       }
     },
     "is-callable": {
@@ -6419,7 +6419,7 @@
       "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
       "dev": true,
       "requires": {
-        "ci-info": "1.1.2"
+        "ci-info": "^1.0.0"
       }
     },
     "is-data-descriptor": {
@@ -6428,7 +6428,7 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -6437,7 +6437,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -6454,9 +6454,9 @@
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "0.1.6",
-        "is-data-descriptor": "0.1.4",
-        "kind-of": "5.1.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -6485,7 +6485,7 @@
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "dev": true,
       "requires": {
-        "is-primitive": "2.0.0"
+        "is-primitive": "^2.0.0"
       }
     },
     "is-extendable": {
@@ -6506,7 +6506,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -6515,7 +6515,7 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-glob": {
@@ -6524,7 +6524,7 @@
       "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "dev": true,
       "requires": {
-        "is-extglob": "2.1.1"
+        "is-extglob": "^2.1.1"
       }
     },
     "is-installed-globally": {
@@ -6533,8 +6533,8 @@
       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
       "dev": true,
       "requires": {
-        "global-dirs": "0.1.1",
-        "is-path-inside": "1.0.1"
+        "global-dirs": "^0.1.0",
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-my-ip-valid": {
@@ -6549,11 +6549,11 @@
       "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
       "dev": true,
       "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "is-my-ip-valid": "1.0.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "is-my-ip-valid": "^1.0.0",
+        "jsonpointer": "^4.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "is-number": {
@@ -6562,7 +6562,7 @@
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -6571,7 +6571,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -6594,7 +6594,7 @@
       "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=",
       "dev": true,
       "requires": {
-        "symbol-observable": "0.2.4"
+        "symbol-observable": "^0.2.2"
       },
       "dependencies": {
         "symbol-observable": {
@@ -6611,7 +6611,7 @@
       "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
       "dev": true,
       "requires": {
-        "is-number": "4.0.0"
+        "is-number": "^4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -6634,7 +6634,7 @@
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
       "requires": {
-        "is-path-inside": "1.0.1"
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-path-inside": {
@@ -6643,7 +6643,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
     "is-plain-obj": {
@@ -6658,7 +6658,7 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "is-posix-bracket": {
@@ -6691,7 +6691,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "1.0.1"
+        "has": "^1.0.1"
       }
     },
     "is-resolvable": {
@@ -6712,7 +6712,7 @@
       "integrity": "sha1-RJypgpnnEwOCViieyytUDcQ3yzA=",
       "dev": true,
       "requires": {
-        "scoped-regex": "1.0.0"
+        "scoped-regex": "^1.0.0"
       }
     },
     "is-stream": {
@@ -6727,7 +6727,7 @@
       "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
       "dev": true,
       "requires": {
-        "html-comment-regex": "1.1.1"
+        "html-comment-regex": "^1.1.0"
       }
     },
     "is-symbol": {
@@ -6794,9 +6794,9 @@
       "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==",
       "dev": true,
       "requires": {
-        "binaryextensions": "2.1.1",
-        "editions": "1.3.4",
-        "textextensions": "2.2.0"
+        "binaryextensions": "2",
+        "editions": "^1.3.3",
+        "textextensions": "2"
       }
     },
     "isurl": {
@@ -6805,8 +6805,8 @@
       "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
       "dev": true,
       "requires": {
-        "has-to-string-tag-x": "1.4.1",
-        "is-object": "1.0.1"
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
       }
     },
     "js-base64": {
@@ -6827,8 +6827,8 @@
       "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
       "dev": true,
       "requires": {
-        "argparse": "1.0.9",
-        "esprima": "2.7.3"
+        "argparse": "^1.0.7",
+        "esprima": "^2.6.0"
       }
     },
     "jsbn": {
@@ -6843,21 +6843,21 @@
       "integrity": "sha512-JAcQINNMFpdzzpKJN8k5xXjF3XDuckB1/48uScSzcnNyK199iWEc9AxKL9OoX5144M2w5zEx9Qs4/E/eBZZUlw==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-flow-strip-types": "6.22.0",
-        "babel-preset-es2015": "6.24.1",
-        "babel-preset-stage-1": "6.24.1",
-        "babel-register": "6.26.0",
-        "babylon": "7.0.0-beta.47",
-        "colors": "1.1.2",
-        "flow-parser": "0.72.0",
-        "lodash": "4.17.5",
-        "micromatch": "2.3.11",
-        "neo-async": "2.5.1",
+        "babel-plugin-transform-flow-strip-types": "^6.8.0",
+        "babel-preset-es2015": "^6.9.0",
+        "babel-preset-stage-1": "^6.5.0",
+        "babel-register": "^6.9.0",
+        "babylon": "^7.0.0-beta.30",
+        "colors": "^1.1.2",
+        "flow-parser": "^0.*",
+        "lodash": "^4.13.1",
+        "micromatch": "^2.3.7",
+        "neo-async": "^2.5.0",
         "node-dir": "0.1.8",
-        "nomnom": "1.8.1",
-        "recast": "0.14.7",
-        "temp": "0.8.3",
-        "write-file-atomic": "1.3.4"
+        "nomnom": "^1.8.1",
+        "recast": "^0.14.1",
+        "temp": "^0.8.1",
+        "write-file-atomic": "^1.2.0"
       },
       "dependencies": {
         "arr-diff": {
@@ -6866,7 +6866,7 @@
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
           "requires": {
-            "arr-flatten": "1.1.0"
+            "arr-flatten": "^1.0.1"
           }
         },
         "array-unique": {
@@ -6887,9 +6887,9 @@
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
           "requires": {
-            "expand-range": "1.8.2",
-            "preserve": "0.2.0",
-            "repeat-element": "1.1.2"
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
           }
         },
         "expand-brackets": {
@@ -6898,7 +6898,7 @@
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
           "requires": {
-            "is-posix-bracket": "0.1.1"
+            "is-posix-bracket": "^0.1.0"
           }
         },
         "extglob": {
@@ -6907,7 +6907,7 @@
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "^1.0.0"
           }
         },
         "is-extglob": {
@@ -6922,7 +6922,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "^1.0.0"
           }
         },
         "kind-of": {
@@ -6931,7 +6931,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         },
         "micromatch": {
@@ -6940,19 +6940,19 @@
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
           "requires": {
-            "arr-diff": "2.0.0",
-            "array-unique": "0.2.1",
-            "braces": "1.8.5",
-            "expand-brackets": "0.1.5",
-            "extglob": "0.3.2",
-            "filename-regex": "2.0.1",
-            "is-extglob": "1.0.0",
-            "is-glob": "2.0.1",
-            "kind-of": "3.2.2",
-            "normalize-path": "2.1.1",
-            "object.omit": "2.0.1",
-            "parse-glob": "3.0.4",
-            "regex-cache": "0.4.4"
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
           }
         }
       }
@@ -6991,7 +6991,7 @@
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "jsonify": "0.0.0"
+        "jsonify": "~0.0.0"
       }
     },
     "json-stable-stringify-without-jsonify": {
@@ -7023,7 +7023,7 @@
       "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -7089,7 +7089,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "1.0.0"
+        "invert-kv": "^1.0.0"
       }
     },
     "leb": {
@@ -7104,8 +7104,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "listr": {
@@ -7114,22 +7114,22 @@
       "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-truncate": "0.2.1",
-        "figures": "1.7.0",
-        "indent-string": "2.1.0",
-        "is-promise": "2.1.0",
-        "is-stream": "1.1.0",
-        "listr-silent-renderer": "1.1.1",
-        "listr-update-renderer": "0.2.0",
-        "listr-verbose-renderer": "0.4.1",
-        "log-symbols": "1.0.2",
-        "log-update": "1.0.2",
-        "ora": "0.2.3",
-        "p-map": "1.2.0",
-        "rxjs": "5.5.6",
-        "stream-to-observable": "0.1.0",
-        "strip-ansi": "3.0.1"
+        "chalk": "^1.1.3",
+        "cli-truncate": "^0.2.1",
+        "figures": "^1.7.0",
+        "indent-string": "^2.1.0",
+        "is-promise": "^2.1.0",
+        "is-stream": "^1.1.0",
+        "listr-silent-renderer": "^1.1.1",
+        "listr-update-renderer": "^0.2.0",
+        "listr-verbose-renderer": "^0.4.0",
+        "log-symbols": "^1.0.2",
+        "log-update": "^1.0.2",
+        "ora": "^0.2.3",
+        "p-map": "^1.1.1",
+        "rxjs": "^5.0.0-beta.11",
+        "stream-to-observable": "^0.1.0",
+        "strip-ansi": "^3.0.1"
       }
     },
     "listr-silent-renderer": {
@@ -7144,14 +7144,14 @@
       "integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-truncate": "0.2.1",
-        "elegant-spinner": "1.0.1",
-        "figures": "1.7.0",
-        "indent-string": "3.2.0",
-        "log-symbols": "1.0.2",
-        "log-update": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "chalk": "^1.1.3",
+        "cli-truncate": "^0.2.1",
+        "elegant-spinner": "^1.0.1",
+        "figures": "^1.7.0",
+        "indent-string": "^3.0.0",
+        "log-symbols": "^1.0.2",
+        "log-update": "^1.0.2",
+        "strip-ansi": "^3.0.1"
       },
       "dependencies": {
         "indent-string": {
@@ -7168,10 +7168,10 @@
       "integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "date-fns": "1.29.0",
-        "figures": "1.7.0"
+        "chalk": "^1.1.3",
+        "cli-cursor": "^1.0.2",
+        "date-fns": "^1.27.2",
+        "figures": "^1.7.0"
       }
     },
     "load-json-file": {
@@ -7180,11 +7180,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       }
     },
     "loader-fs-cache": {
@@ -7193,7 +7193,7 @@
       "integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
       "dev": true,
       "requires": {
-        "find-cache-dir": "0.1.1",
+        "find-cache-dir": "^0.1.1",
         "mkdirp": "0.5.1"
       },
       "dependencies": {
@@ -7203,9 +7203,9 @@
           "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
           "dev": true,
           "requires": {
-            "commondir": "1.0.1",
-            "mkdirp": "0.5.1",
-            "pkg-dir": "1.0.0"
+            "commondir": "^1.0.1",
+            "mkdirp": "^0.5.1",
+            "pkg-dir": "^1.0.0"
           }
         },
         "pkg-dir": {
@@ -7214,7 +7214,7 @@
           "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
           "dev": true,
           "requires": {
-            "find-up": "1.1.2"
+            "find-up": "^1.0.0"
           }
         }
       }
@@ -7231,9 +7231,9 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "3.2.0",
-        "emojis-list": "2.1.0",
-        "json5": "0.5.1"
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
       }
     },
     "locate-path": {
@@ -7242,8 +7242,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       },
       "dependencies": {
         "path-exists": {
@@ -7319,7 +7319,7 @@
       "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3"
+        "chalk": "^1.0.0"
       }
     },
     "log-update": {
@@ -7328,8 +7328,8 @@
       "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "1.4.0",
-        "cli-cursor": "1.0.2"
+        "ansi-escapes": "^1.0.0",
+        "cli-cursor": "^1.0.2"
       }
     },
     "loglevel": {
@@ -7344,8 +7344,8 @@
       "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
       "dev": true,
       "requires": {
-        "es6-symbol": "3.1.1",
-        "object.assign": "4.1.0"
+        "es6-symbol": "^3.1.1",
+        "object.assign": "^4.1.0"
       }
     },
     "long": {
@@ -7360,7 +7360,7 @@
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "dev": true,
       "requires": {
-        "js-tokens": "3.0.2"
+        "js-tokens": "^3.0.0"
       }
     },
     "loud-rejection": {
@@ -7369,8 +7369,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
       }
     },
     "lowercase-keys": {
@@ -7385,8 +7385,8 @@
       "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
       "dev": true,
       "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "macaddress": {
@@ -7401,7 +7401,7 @@
       "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
       "dev": true,
       "requires": {
-        "pify": "3.0.0"
+        "pify": "^3.0.0"
       },
       "dependencies": {
         "pify": {
@@ -7430,7 +7430,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "1.0.1"
+        "object-visit": "^1.0.0"
       }
     },
     "math-expression-evaluator": {
@@ -7451,8 +7451,8 @@
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "mdi": {
@@ -7472,7 +7472,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "^1.0.0"
       }
     },
     "mem-fs": {
@@ -7481,9 +7481,9 @@
       "integrity": "sha1-uK6NLj/Lb10/kWXBLUVRoGXZicw=",
       "dev": true,
       "requires": {
-        "through2": "2.0.3",
-        "vinyl": "1.2.0",
-        "vinyl-file": "2.0.0"
+        "through2": "^2.0.0",
+        "vinyl": "^1.1.0",
+        "vinyl-file": "^2.0.0"
       }
     },
     "mem-fs-editor": {
@@ -7492,17 +7492,17 @@
       "integrity": "sha512-QHvdXLLNmwJXxKdf7x27aNUren6IoPxwcM8Sfd+S6/ddQQMcYdEtVKsh6ilpqMrU18VQuKZEaH0aCGt3JDbA0g==",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "deep-extend": "0.5.1",
-        "ejs": "2.6.1",
-        "glob": "7.1.2",
-        "globby": "8.0.1",
-        "isbinaryfile": "3.0.2",
-        "mkdirp": "0.5.1",
-        "multimatch": "2.1.0",
-        "rimraf": "2.6.2",
-        "through2": "2.0.3",
-        "vinyl": "2.1.0"
+        "commondir": "^1.0.1",
+        "deep-extend": "^0.5.1",
+        "ejs": "^2.5.9",
+        "glob": "^7.0.3",
+        "globby": "^8.0.0",
+        "isbinaryfile": "^3.0.2",
+        "mkdirp": "^0.5.0",
+        "multimatch": "^2.0.0",
+        "rimraf": "^2.2.8",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.1"
       },
       "dependencies": {
         "clone": {
@@ -7523,13 +7523,13 @@
           "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
           "dev": true,
           "requires": {
-            "array-union": "1.0.2",
-            "dir-glob": "2.0.0",
-            "fast-glob": "2.2.1",
-            "glob": "7.1.2",
-            "ignore": "3.3.7",
-            "pify": "3.0.0",
-            "slash": "1.0.0"
+            "array-union": "^1.0.1",
+            "dir-glob": "^2.0.0",
+            "fast-glob": "^2.0.2",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
           }
         },
         "pify": {
@@ -7550,12 +7550,12 @@
           "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
           "dev": true,
           "requires": {
-            "clone": "2.1.1",
-            "clone-buffer": "1.0.0",
-            "clone-stats": "1.0.0",
-            "cloneable-readable": "1.1.2",
-            "remove-trailing-separator": "1.1.0",
-            "replace-ext": "1.0.0"
+            "clone": "^2.1.1",
+            "clone-buffer": "^1.0.0",
+            "clone-stats": "^1.0.0",
+            "cloneable-readable": "^1.0.0",
+            "remove-trailing-separator": "^1.0.1",
+            "replace-ext": "^1.0.0"
           }
         }
       }
@@ -7566,8 +7566,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "0.1.7",
-        "readable-stream": "2.3.3"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       }
     },
     "meow": {
@@ -7576,16 +7576,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.4.0",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -7608,7 +7608,7 @@
       "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
       "dev": true,
       "requires": {
-        "source-map": "0.6.1"
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -7637,19 +7637,19 @@
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "braces": "2.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "extglob": "2.0.4",
-        "fragment-cache": "0.2.1",
-        "kind-of": "6.0.2",
-        "nanomatch": "1.2.9",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       }
     },
     "miller-rabin": {
@@ -7658,8 +7658,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0"
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
       }
     },
     "mime": {
@@ -7678,7 +7678,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "~1.30.0"
       }
     },
     "mimic-fn": {
@@ -7711,7 +7711,7 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "1.1.8"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -7726,16 +7726,16 @@
       "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.0",
-        "duplexify": "3.5.4",
-        "end-of-stream": "1.4.1",
-        "flush-write-stream": "1.0.3",
-        "from2": "2.3.0",
-        "parallel-transform": "1.1.0",
-        "pump": "2.0.1",
-        "pumpify": "1.4.0",
-        "stream-each": "1.2.2",
-        "through2": "2.0.3"
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^2.0.1",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
       }
     },
     "mixin-deep": {
@@ -7744,8 +7744,8 @@
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2",
-        "is-extendable": "1.0.1"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -7754,7 +7754,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -7765,8 +7765,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "0.1.8",
-        "is-extendable": "0.1.1"
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -7797,12 +7797,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "copy-concurrently": "1.0.5",
-        "fs-write-stream-atomic": "1.0.10",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2",
-        "run-queue": "1.0.3"
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
       }
     },
     "ms": {
@@ -7816,8 +7816,8 @@
       "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "1.3.1",
-        "thunky": "1.0.2"
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
       }
     },
     "multicast-dns-service-types": {
@@ -7832,10 +7832,10 @@
       "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
       "dev": true,
       "requires": {
-        "array-differ": "1.0.0",
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "minimatch": "3.0.4"
+        "array-differ": "^1.0.0",
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "minimatch": "^3.0.0"
       }
     },
     "mute-stream": {
@@ -7856,18 +7856,18 @@
       "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
       "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "fragment-cache": "0.2.1",
-        "is-odd": "2.0.0",
-        "is-windows": "1.0.2",
-        "kind-of": "6.0.2",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-odd": "^2.0.0",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       }
     },
     "natural-compare": {
@@ -7918,19 +7918,19 @@
       "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
       "dev": true,
       "requires": {
-        "fstream": "1.0.11",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "osenv": "0.1.5",
-        "request": "2.87.0",
-        "rimraf": "2.6.2",
-        "semver": "5.3.0",
-        "tar": "2.2.1",
-        "which": "1.3.0"
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "2",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
       },
       "dependencies": {
         "semver": {
@@ -7947,28 +7947,28 @@
       "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
       "dev": true,
       "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.2.0",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "1.1.1",
-        "https-browserify": "1.0.0",
-        "os-browserify": "0.3.0",
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^1.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
         "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.3",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.8.2",
-        "string_decoder": "1.0.3",
-        "timers-browserify": "2.0.10",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
         "vm-browserify": "0.0.4"
       }
     },
@@ -7978,25 +7978,25 @@
       "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==",
       "dev": true,
       "requires": {
-        "async-foreach": "0.1.3",
-        "chalk": "1.1.3",
-        "cross-spawn": "3.0.1",
-        "gaze": "1.1.2",
-        "get-stdin": "4.0.1",
-        "glob": "7.1.2",
-        "in-publish": "2.0.0",
-        "lodash.assign": "4.2.0",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.mergewith": "4.6.1",
-        "meow": "3.7.0",
-        "mkdirp": "0.5.1",
-        "nan": "2.10.0",
-        "node-gyp": "3.6.2",
-        "npmlog": "4.1.2",
-        "request": "2.79.0",
-        "sass-graph": "2.2.4",
-        "stdout-stream": "1.4.0",
-        "true-case-path": "1.0.2"
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash.assign": "^4.2.0",
+        "lodash.clonedeep": "^4.3.2",
+        "lodash.mergewith": "^4.6.0",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.10.0",
+        "node-gyp": "^3.3.1",
+        "npmlog": "^4.0.0",
+        "request": "~2.79.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
       },
       "dependencies": {
         "caseless": {
@@ -8011,8 +8011,8 @@
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.1",
-            "which": "1.3.0"
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
           }
         },
         "har-validator": {
@@ -8021,10 +8021,10 @@
           "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "commander": "2.15.1",
-            "is-my-json-valid": "2.17.2",
-            "pinkie-promise": "2.0.1"
+            "chalk": "^1.1.1",
+            "commander": "^2.9.0",
+            "is-my-json-valid": "^2.12.4",
+            "pinkie-promise": "^2.0.0"
           }
         },
         "qs": {
@@ -8039,26 +8039,26 @@
           "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
           "dev": true,
           "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.11.0",
-            "combined-stream": "1.0.6",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "2.0.6",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.17",
-            "oauth-sign": "0.8.2",
-            "qs": "6.3.2",
-            "stringstream": "0.0.6",
-            "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.4.3",
-            "uuid": "3.2.1"
+            "aws-sign2": "~0.6.0",
+            "aws4": "^1.2.1",
+            "caseless": "~0.11.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.1.1",
+            "har-validator": "~2.0.6",
+            "hawk": "~3.1.3",
+            "http-signature": "~1.1.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.7",
+            "oauth-sign": "~0.8.1",
+            "qs": "~6.3.0",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.3.0",
+            "tunnel-agent": "~0.4.1",
+            "uuid": "^3.0.0"
           }
         },
         "tunnel-agent": {
@@ -8075,8 +8075,8 @@
       "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
       "dev": true,
       "requires": {
-        "chalk": "0.4.0",
-        "underscore": "1.6.0"
+        "chalk": "~0.4.0",
+        "underscore": "~1.6.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8091,9 +8091,9 @@
           "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
           "dev": true,
           "requires": {
-            "ansi-styles": "1.0.0",
-            "has-color": "0.1.7",
-            "strip-ansi": "0.1.1"
+            "ansi-styles": "~1.0.0",
+            "has-color": "~0.1.0",
+            "strip-ansi": "~0.1.0"
           }
         },
         "strip-ansi": {
@@ -8110,7 +8110,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.1"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
@@ -8119,10 +8119,10 @@
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
-        "validate-npm-package-license": "3.0.1"
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
@@ -8131,7 +8131,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
       }
     },
     "normalize-range": {
@@ -8146,10 +8146,10 @@
       "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
       }
     },
     "npm-run-path": {
@@ -8158,7 +8158,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "2.0.1"
+        "path-key": "^2.0.0"
       }
     },
     "npmlog": {
@@ -8167,10 +8167,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "1.1.4",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
       }
     },
     "nth-check": {
@@ -8178,7 +8178,7 @@
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
       "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
       "requires": {
-        "boolbase": "1.0.0"
+        "boolbase": "~1.0.0"
       }
     },
     "num2fraction": {
@@ -8210,9 +8210,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "0.1.1",
-        "define-property": "0.2.5",
-        "kind-of": "3.2.2"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
         "define-property": {
@@ -8221,7 +8221,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "kind-of": {
@@ -8230,7 +8230,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -8253,7 +8253,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.0"
       }
     },
     "object.assign": {
@@ -8262,10 +8262,10 @@
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.2",
-        "function-bind": "1.1.1",
-        "has-symbols": "1.0.0",
-        "object-keys": "1.0.11"
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
       }
     },
     "object.omit": {
@@ -8274,8 +8274,8 @@
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "dev": true,
       "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
       }
     },
     "object.pick": {
@@ -8284,7 +8284,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "obuf": {
@@ -8314,7 +8314,7 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "onetime": {
@@ -8329,7 +8329,7 @@
       "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
       "dev": true,
       "requires": {
-        "is-wsl": "1.1.0"
+        "is-wsl": "^1.1.0"
       }
     },
     "optionator": {
@@ -8338,12 +8338,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       },
       "dependencies": {
         "wordwrap": {
@@ -8360,10 +8360,10 @@
       "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "cli-spinners": "0.1.2",
-        "object-assign": "4.1.1"
+        "chalk": "^1.1.1",
+        "cli-cursor": "^1.0.2",
+        "cli-spinners": "^0.1.2",
+        "object-assign": "^4.0.1"
       }
     },
     "original": {
@@ -8372,7 +8372,7 @@
       "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==",
       "dev": true,
       "requires": {
-        "url-parse": "1.4.0"
+        "url-parse": "~1.4.0"
       }
     },
     "os-browserify": {
@@ -8393,7 +8393,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "1.0.0"
+        "lcid": "^1.0.0"
       }
     },
     "os-tmpdir": {
@@ -8408,8 +8408,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
     "p-cancelable": {
@@ -8424,7 +8424,7 @@
       "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
       "dev": true,
       "requires": {
-        "p-reduce": "1.0.0"
+        "p-reduce": "^1.0.0"
       }
     },
     "p-finally": {
@@ -8451,7 +8451,7 @@
       "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
       "dev": true,
       "requires": {
-        "p-try": "1.0.0"
+        "p-try": "^1.0.0"
       }
     },
     "p-locate": {
@@ -8460,7 +8460,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "1.2.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-map": {
@@ -8481,7 +8481,7 @@
       "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
       "dev": true,
       "requires": {
-        "p-finally": "1.0.0"
+        "p-finally": "^1.0.0"
       }
     },
     "p-try": {
@@ -8502,9 +8502,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "0.2.2",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
       }
     },
     "parse-asn1": {
@@ -8513,11 +8513,11 @@
       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
       "dev": true,
       "requires": {
-        "asn1.js": "4.10.1",
-        "browserify-aes": "1.2.0",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.16"
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3"
       }
     },
     "parse-glob": {
@@ -8526,10 +8526,10 @@
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "dev": true,
       "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
       },
       "dependencies": {
         "is-extglob": {
@@ -8544,7 +8544,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "^1.0.0"
           }
         }
       }
@@ -8555,7 +8555,7 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "1.3.1"
+        "error-ex": "^1.2.0"
       }
     },
     "parse-passwd": {
@@ -8594,7 +8594,7 @@
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "dev": true,
       "requires": {
-        "pinkie-promise": "2.0.1"
+        "pinkie-promise": "^2.0.0"
       }
     },
     "path-is-absolute": {
@@ -8633,9 +8633,9 @@
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "pbkdf2": {
@@ -8644,11 +8644,11 @@
       "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
       "dev": true,
       "requires": {
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.11"
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "pend": {
@@ -8681,7 +8681,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "pkg-dir": {
@@ -8690,7 +8690,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "2.1.0"
+        "find-up": "^2.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -8699,7 +8699,7 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         }
       }
@@ -8721,9 +8721,9 @@
       "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=",
       "dev": true,
       "requires": {
-        "async": "1.5.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1"
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
       },
       "dependencies": {
         "async": {
@@ -8746,9 +8746,9 @@
       "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
       "dev": true,
       "requires": {
-        "chalk": "2.3.2",
-        "source-map": "0.6.1",
-        "supports-color": "5.3.0"
+        "chalk": "^2.3.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.3.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8757,7 +8757,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -8766,9 +8766,9 @@
           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "source-map": {
@@ -8783,7 +8783,7 @@
           "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -8794,9 +8794,9 @@
       "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-message-helpers": "2.0.0",
-        "reduce-css-calc": "1.3.0"
+        "postcss": "^5.0.2",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-css-calc": "^1.2.6"
       },
       "dependencies": {
         "has-flag": {
@@ -8811,10 +8811,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -8823,7 +8823,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -8834,9 +8834,9 @@
       "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
       "dev": true,
       "requires": {
-        "colormin": "1.1.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "colormin": "^1.0.5",
+        "postcss": "^5.0.13",
+        "postcss-value-parser": "^3.2.3"
       },
       "dependencies": {
         "has-flag": {
@@ -8851,10 +8851,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -8863,7 +8863,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -8874,8 +8874,8 @@
       "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.11",
+        "postcss-value-parser": "^3.1.2"
       },
       "dependencies": {
         "has-flag": {
@@ -8890,10 +8890,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -8902,7 +8902,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -8913,7 +8913,7 @@
       "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.14"
       },
       "dependencies": {
         "has-flag": {
@@ -8928,10 +8928,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -8940,7 +8940,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -8951,7 +8951,7 @@
       "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       },
       "dependencies": {
         "has-flag": {
@@ -8966,10 +8966,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -8978,7 +8978,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -8989,7 +8989,7 @@
       "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.14"
       },
       "dependencies": {
         "has-flag": {
@@ -9004,10 +9004,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9016,7 +9016,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9027,7 +9027,7 @@
       "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.16"
       },
       "dependencies": {
         "has-flag": {
@@ -9042,10 +9042,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9054,7 +9054,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9065,8 +9065,8 @@
       "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "postcss": "^5.0.14",
+        "uniqs": "^2.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9081,10 +9081,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9093,7 +9093,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9104,8 +9104,8 @@
       "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "uniqid": "4.1.1"
+        "postcss": "^5.0.4",
+        "uniqid": "^4.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9120,10 +9120,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9132,7 +9132,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9143,10 +9143,10 @@
       "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1",
-        "postcss-load-options": "1.2.0",
-        "postcss-load-plugins": "2.3.0"
+        "cosmiconfig": "^2.1.0",
+        "object-assign": "^4.1.0",
+        "postcss-load-options": "^1.2.0",
+        "postcss-load-plugins": "^2.3.0"
       }
     },
     "postcss-load-options": {
@@ -9155,8 +9155,8 @@
       "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
+        "cosmiconfig": "^2.1.0",
+        "object-assign": "^4.1.0"
       }
     },
     "postcss-load-plugins": {
@@ -9165,8 +9165,8 @@
       "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
+        "cosmiconfig": "^2.1.1",
+        "object-assign": "^4.1.0"
       }
     },
     "postcss-loader": {
@@ -9175,10 +9175,10 @@
       "integrity": "sha512-pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
-        "postcss": "6.0.21",
-        "postcss-load-config": "1.2.0",
-        "schema-utils": "0.4.5"
+        "loader-utils": "^1.1.0",
+        "postcss": "^6.0.0",
+        "postcss-load-config": "^1.2.0",
+        "schema-utils": "^0.4.0"
       }
     },
     "postcss-merge-idents": {
@@ -9187,9 +9187,9 @@
       "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "has": "^1.0.1",
+        "postcss": "^5.0.10",
+        "postcss-value-parser": "^3.1.1"
       },
       "dependencies": {
         "has-flag": {
@@ -9204,10 +9204,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9216,7 +9216,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9227,7 +9227,7 @@
       "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       },
       "dependencies": {
         "has-flag": {
@@ -9242,10 +9242,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9254,7 +9254,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9265,11 +9265,11 @@
       "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
       "dev": true,
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-api": "1.6.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.1"
+        "browserslist": "^1.5.2",
+        "caniuse-api": "^1.5.2",
+        "postcss": "^5.0.4",
+        "postcss-selector-parser": "^2.2.2",
+        "vendors": "^1.0.0"
       },
       "dependencies": {
         "browserslist": {
@@ -9278,8 +9278,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000820",
-            "electron-to-chromium": "1.3.40"
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
           }
         },
         "has-flag": {
@@ -9294,10 +9294,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9306,7 +9306,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9323,9 +9323,9 @@
       "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.2"
       },
       "dependencies": {
         "has-flag": {
@@ -9340,10 +9340,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9352,7 +9352,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9363,8 +9363,8 @@
       "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.12",
+        "postcss-value-parser": "^3.3.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9379,10 +9379,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9391,7 +9391,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9402,10 +9402,10 @@
       "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "uniqs": "2.0.0"
+        "alphanum-sort": "^1.0.1",
+        "postcss": "^5.0.2",
+        "postcss-value-parser": "^3.0.2",
+        "uniqs": "^2.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9420,10 +9420,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9432,7 +9432,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9443,10 +9443,10 @@
       "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3"
+        "alphanum-sort": "^1.0.2",
+        "has": "^1.0.1",
+        "postcss": "^5.0.14",
+        "postcss-selector-parser": "^2.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9461,10 +9461,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9473,7 +9473,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9484,7 +9484,7 @@
       "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.21"
+        "postcss": "^6.0.1"
       }
     },
     "postcss-modules-local-by-default": {
@@ -9493,8 +9493,8 @@
       "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.21"
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
       }
     },
     "postcss-modules-scope": {
@@ -9503,8 +9503,8 @@
       "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.21"
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
       }
     },
     "postcss-modules-values": {
@@ -9513,8 +9513,8 @@
       "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
       "dev": true,
       "requires": {
-        "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.21"
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^6.0.1"
       }
     },
     "postcss-normalize-charset": {
@@ -9523,7 +9523,7 @@
       "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.5"
       },
       "dependencies": {
         "has-flag": {
@@ -9538,10 +9538,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9550,7 +9550,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9561,10 +9561,10 @@
       "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
       "dev": true,
       "requires": {
-        "is-absolute-url": "2.1.0",
-        "normalize-url": "1.9.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^1.4.0",
+        "postcss": "^5.0.14",
+        "postcss-value-parser": "^3.2.3"
       },
       "dependencies": {
         "has-flag": {
@@ -9579,10 +9579,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9591,7 +9591,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9602,8 +9602,8 @@
       "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.1"
       },
       "dependencies": {
         "has-flag": {
@@ -9618,10 +9618,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9630,7 +9630,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9641,8 +9641,8 @@
       "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.2"
       },
       "dependencies": {
         "has-flag": {
@@ -9657,10 +9657,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9669,7 +9669,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9680,7 +9680,7 @@
       "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       },
       "dependencies": {
         "has-flag": {
@@ -9695,10 +9695,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9707,7 +9707,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9718,9 +9718,9 @@
       "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "has": "^1.0.1",
+        "postcss": "^5.0.8",
+        "postcss-value-parser": "^3.0.1"
       },
       "dependencies": {
         "has-flag": {
@@ -9735,10 +9735,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9747,7 +9747,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9758,9 +9758,9 @@
       "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
       "dev": true,
       "requires": {
-        "flatten": "1.0.2",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       }
     },
     "postcss-svgo": {
@@ -9769,10 +9769,10 @@
       "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
       "dev": true,
       "requires": {
-        "is-svg": "2.1.0",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "svgo": "0.7.2"
+        "is-svg": "^2.0.0",
+        "postcss": "^5.0.14",
+        "postcss-value-parser": "^3.2.3",
+        "svgo": "^0.7.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9787,10 +9787,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9799,7 +9799,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9810,9 +9810,9 @@
       "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "alphanum-sort": "^1.0.1",
+        "postcss": "^5.0.4",
+        "uniqs": "^2.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9827,10 +9827,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9839,7 +9839,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9856,9 +9856,9 @@
       "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "has": "^1.0.1",
+        "postcss": "^5.0.4",
+        "uniqs": "^2.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9873,10 +9873,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
           }
         },
         "supports-color": {
@@ -9885,7 +9885,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9956,7 +9956,7 @@
       "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
       "dev": true,
       "requires": {
-        "forwarded": "0.1.2",
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.6.0"
       }
     },
@@ -9978,11 +9978,11 @@
       "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.2.0",
-        "parse-asn1": "5.1.1",
-        "randombytes": "2.0.6"
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1"
       }
     },
     "pump": {
@@ -9991,8 +9991,8 @@
       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "once": "1.4.0"
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
       }
     },
     "pumpify": {
@@ -10001,9 +10001,9 @@
       "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
       "dev": true,
       "requires": {
-        "duplexify": "3.5.4",
-        "inherits": "2.0.3",
-        "pump": "2.0.1"
+        "duplexify": "^3.5.3",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
       }
     },
     "punycode": {
@@ -10028,8 +10028,8 @@
       "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
       }
     },
     "querystring": {
@@ -10062,9 +10062,9 @@
       "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
       "dev": true,
       "requires": {
-        "is-number": "4.0.0",
-        "kind-of": "6.0.2",
-        "math-random": "1.0.1"
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
       },
       "dependencies": {
         "is-number": {
@@ -10081,7 +10081,7 @@
       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.1.0"
       }
     },
     "randomfill": {
@@ -10090,8 +10090,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "2.0.6",
-        "safe-buffer": "5.1.1"
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
       }
     },
     "range-parser": {
@@ -10127,7 +10127,7 @@
             "depd": "1.1.1",
             "inherits": "2.0.3",
             "setprototypeof": "1.0.3",
-            "statuses": "1.4.0"
+            "statuses": ">= 1.3.1 < 2"
           }
         },
         "setprototypeof": {
@@ -10144,8 +10144,8 @@
       "integrity": "sha1-agTAkoAF7Z1C4aasVgDhnLx/9lU=",
       "dev": true,
       "requires": {
-        "pify": "3.0.0",
-        "safe-buffer": "5.1.1"
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1"
       },
       "dependencies": {
         "pify": {
@@ -10162,9 +10162,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
       }
     },
     "read-pkg-up": {
@@ -10173,8 +10173,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       }
     },
     "readable-stream": {
@@ -10183,13 +10183,13 @@
       "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "dev": true,
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -10198,10 +10198,10 @@
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
-        "set-immediate-shim": "1.0.1"
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
       }
     },
     "recast": {
@@ -10211,9 +10211,9 @@
       "dev": true,
       "requires": {
         "ast-types": "0.11.3",
-        "esprima": "4.0.0",
-        "private": "0.1.8",
-        "source-map": "0.6.1"
+        "esprima": "~4.0.0",
+        "private": "~0.1.5",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "esprima": {
@@ -10236,7 +10236,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "1.6.0"
+        "resolve": "^1.1.6"
       }
     },
     "redent": {
@@ -10245,8 +10245,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
       }
     },
     "reduce-css-calc": {
@@ -10255,9 +10255,9 @@
       "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
       "dev": true,
       "requires": {
-        "balanced-match": "0.4.2",
-        "math-expression-evaluator": "1.2.17",
-        "reduce-function-call": "1.0.2"
+        "balanced-match": "^0.4.2",
+        "math-expression-evaluator": "^1.2.14",
+        "reduce-function-call": "^1.0.1"
       },
       "dependencies": {
         "balanced-match": {
@@ -10274,7 +10274,7 @@
       "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
       "dev": true,
       "requires": {
-        "balanced-match": "0.4.2"
+        "balanced-match": "^0.4.2"
       },
       "dependencies": {
         "balanced-match": {
@@ -10303,9 +10303,9 @@
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "private": "0.1.8"
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
       }
     },
     "regex-cache": {
@@ -10314,7 +10314,7 @@
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3"
+        "is-equal-shallow": "^0.1.3"
       }
     },
     "regex-not": {
@@ -10323,8 +10323,8 @@
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2",
-        "safe-regex": "1.1.0"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "regexpp": {
@@ -10339,9 +10339,9 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "1.3.3",
-        "regjsgen": "0.2.0",
-        "regjsparser": "0.1.5"
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
       }
     },
     "regjsgen": {
@@ -10356,7 +10356,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -10391,7 +10391,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "1.0.2"
+        "is-finite": "^1.0.0"
       }
     },
     "replace-ext": {
@@ -10405,26 +10405,26 @@
       "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
       "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
       "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.6",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.2",
-        "har-validator": "5.0.3",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.2",
-        "safe-buffer": "5.1.1",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.2.1"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.6.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.5",
+        "extend": "~3.0.1",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.1",
+        "har-validator": "~5.0.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.17",
+        "oauth-sign": "~0.8.2",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.1",
+        "safe-buffer": "^5.1.1",
+        "tough-cookie": "~2.3.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.1.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -10442,9 +10442,9 @@
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
           "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
           "requires": {
-            "asynckit": "0.4.0",
+            "asynckit": "^0.4.0",
             "combined-stream": "1.0.6",
-            "mime-types": "2.1.17"
+            "mime-types": "^2.1.12"
           }
         },
         "http-signature": {
@@ -10452,9 +10452,9 @@
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
           "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
           "requires": {
-            "assert-plus": "1.0.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.14.1"
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
           }
         },
         "performance-now": {
@@ -10470,7 +10470,7 @@
       "integrity": "sha1-ByHBBdipasayzossia4tXs/Pazo=",
       "dev": true,
       "requires": {
-        "throttleit": "0.0.2"
+        "throttleit": "~0.0.2"
       }
     },
     "require-directory": {
@@ -10497,8 +10497,8 @@
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
-        "caller-path": "0.1.0",
-        "resolve-from": "1.0.1"
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
       },
       "dependencies": {
         "resolve-from": {
@@ -10521,7 +10521,7 @@
       "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.5"
+        "path-parse": "^1.0.5"
       }
     },
     "resolve-cwd": {
@@ -10530,7 +10530,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "3.0.0"
+        "resolve-from": "^3.0.0"
       }
     },
     "resolve-dir": {
@@ -10539,8 +10539,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "global-modules": "1.0.0"
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
       }
     },
     "resolve-from": {
@@ -10561,7 +10561,7 @@
       "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
       "dev": true,
       "requires": {
-        "lowercase-keys": "1.0.1"
+        "lowercase-keys": "^1.0.0"
       }
     },
     "restore-cursor": {
@@ -10570,8 +10570,8 @@
       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
       "dev": true,
       "requires": {
-        "exit-hook": "1.1.1",
-        "onetime": "1.1.0"
+        "exit-hook": "^1.0.0",
+        "onetime": "^1.0.0"
       }
     },
     "ret": {
@@ -10586,7 +10586,7 @@
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.0.5"
       }
     },
     "ripemd160": {
@@ -10595,8 +10595,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "run-async": {
@@ -10605,7 +10605,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "2.1.0"
+        "is-promise": "^2.1.0"
       }
     },
     "run-queue": {
@@ -10614,7 +10614,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0"
+        "aproba": "^1.1.1"
       }
     },
     "rx-lite": {
@@ -10629,7 +10629,7 @@
       "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
       "dev": true,
       "requires": {
-        "rx-lite": "4.0.8"
+        "rx-lite": "*"
       }
     },
     "rxjs": {
@@ -10652,7 +10652,7 @@
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
-        "ret": "0.1.15"
+        "ret": "~0.1.10"
       }
     },
     "sass-graph": {
@@ -10661,10 +10661,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.5",
-        "scss-tokenizer": "0.2.3",
-        "yargs": "7.1.0"
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -10679,19 +10679,19 @@
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "5.0.0"
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
           }
         },
         "yargs-parser": {
@@ -10700,7 +10700,7 @@
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
-            "camelcase": "3.0.0"
+            "camelcase": "^3.0.0"
           }
         }
       }
@@ -10711,11 +10711,11 @@
       "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==",
       "dev": true,
       "requires": {
-        "clone-deep": "2.0.2",
-        "loader-utils": "1.1.0",
-        "lodash.tail": "4.1.1",
-        "neo-async": "2.5.1",
-        "pify": "3.0.0"
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0"
       },
       "dependencies": {
         "pify": {
@@ -10738,8 +10738,8 @@
       "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
       "dev": true,
       "requires": {
-        "ajv": "6.4.0",
-        "ajv-keywords": "3.1.0"
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0"
       },
       "dependencies": {
         "ajv": {
@@ -10748,10 +10748,10 @@
           "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "1.0.0",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1",
-            "uri-js": "3.0.2"
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0",
+            "uri-js": "^3.0.2"
           }
         },
         "ajv-keywords": {
@@ -10774,8 +10774,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "2.4.0",
-        "source-map": "0.4.4"
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
       },
       "dependencies": {
         "source-map": {
@@ -10784,7 +10784,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -10817,18 +10817,18 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.6.3",
+        "http-errors": "~1.6.2",
         "mime": "1.4.1",
         "ms": "2.0.0",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.4.0"
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
       }
     },
     "serialize-javascript": {
@@ -10843,13 +10843,13 @@
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.4",
         "batch": "0.6.1",
         "debug": "2.6.9",
-        "escape-html": "1.0.3",
-        "http-errors": "1.6.3",
-        "mime-types": "2.1.17",
-        "parseurl": "1.3.2"
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
       }
     },
     "serve-static": {
@@ -10858,9 +10858,9 @@
       "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "dev": true,
       "requires": {
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
         "send": "0.16.2"
       }
     },
@@ -10882,10 +10882,10 @@
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-extendable": "0.1.1",
-        "is-plain-object": "2.0.4",
-        "split-string": "3.1.0"
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -10894,7 +10894,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -10917,8 +10917,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "shallow-clone": {
@@ -10927,9 +10927,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "0.1.1",
-        "kind-of": "5.1.0",
-        "mixin-object": "2.0.1"
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -10946,7 +10946,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "1.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
@@ -10961,9 +10961,9 @@
       "integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "interpret": "1.1.0",
-        "rechoir": "0.6.2"
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
       }
     },
     "signal-exit": {
@@ -10996,14 +10996,14 @@
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "base": "0.11.2",
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "map-cache": "0.2.2",
-        "source-map": "0.5.7",
-        "source-map-resolve": "0.5.1",
-        "use": "3.1.0"
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -11012,7 +11012,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -11021,7 +11021,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -11032,9 +11032,9 @@
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "snapdragon-util": "3.0.1"
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -11043,7 +11043,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -11052,7 +11052,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -11061,7 +11061,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -11070,9 +11070,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -11083,7 +11083,7 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.2.0"
       },
       "dependencies": {
         "kind-of": {
@@ -11092,7 +11092,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -11103,7 +11103,7 @@
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "2.x.x"
       }
     },
     "sockjs": {
@@ -11112,8 +11112,8 @@
       "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "0.10.0",
-        "uuid": "3.2.1"
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
       }
     },
     "sockjs-client": {
@@ -11122,12 +11122,12 @@
       "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
+        "debug": "^2.6.6",
         "eventsource": "0.1.6",
-        "faye-websocket": "0.11.1",
-        "inherits": "2.0.3",
-        "json3": "3.3.2",
-        "url-parse": "1.4.0"
+        "faye-websocket": "~0.11.0",
+        "inherits": "^2.0.1",
+        "json3": "^3.3.2",
+        "url-parse": "^1.1.8"
       },
       "dependencies": {
         "faye-websocket": {
@@ -11136,7 +11136,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.7.0"
+            "websocket-driver": ">=0.5.1"
           }
         }
       }
@@ -11147,7 +11147,7 @@
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "dev": true,
       "requires": {
-        "is-plain-obj": "1.1.0"
+        "is-plain-obj": "^1.0.0"
       }
     },
     "sortablejs": {
@@ -11173,11 +11173,11 @@
       "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
       "dev": true,
       "requires": {
-        "atob": "2.1.0",
-        "decode-uri-component": "0.2.0",
-        "resolve-url": "0.2.1",
-        "source-map-url": "0.4.0",
-        "urix": "0.1.0"
+        "atob": "^2.0.0",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-support": {
@@ -11186,7 +11186,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "^0.5.6"
       }
     },
     "source-map-url": {
@@ -11201,7 +11201,7 @@
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
       "dev": true,
       "requires": {
-        "spdx-license-ids": "1.2.2"
+        "spdx-license-ids": "^1.0.2"
       }
     },
     "spdx-expression-parse": {
@@ -11222,12 +11222,12 @@
       "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "handle-thing": "1.2.5",
-        "http-deceiver": "1.2.7",
-        "safe-buffer": "5.1.1",
-        "select-hose": "2.0.0",
-        "spdy-transport": "2.1.0"
+        "debug": "^2.6.8",
+        "handle-thing": "^1.2.5",
+        "http-deceiver": "^1.2.7",
+        "safe-buffer": "^5.0.1",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^2.0.18"
       }
     },
     "spdy-transport": {
@@ -11236,13 +11236,13 @@
       "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "detect-node": "2.0.3",
-        "hpack.js": "2.1.6",
-        "obuf": "1.1.2",
-        "readable-stream": "2.3.3",
-        "safe-buffer": "5.1.1",
-        "wbuf": "1.7.3"
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.1",
+        "readable-stream": "^2.2.9",
+        "safe-buffer": "^5.0.1",
+        "wbuf": "^1.7.2"
       }
     },
     "split-string": {
@@ -11251,7 +11251,7 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2"
+        "extend-shallow": "^3.0.0"
       }
     },
     "sprintf-js": {
@@ -11265,14 +11265,14 @@
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
       "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
       "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "tweetnacl": "~0.14.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -11288,7 +11288,7 @@
       "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.1.1"
       }
     },
     "static-extend": {
@@ -11297,8 +11297,8 @@
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "0.2.5",
-        "object-copy": "0.1.0"
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -11307,7 +11307,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -11324,7 +11324,7 @@
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "^2.0.1"
       }
     },
     "stream-browserify": {
@@ -11333,8 +11333,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "stream-each": {
@@ -11343,8 +11343,8 @@
       "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "stream-http": {
@@ -11353,11 +11353,11 @@
       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       },
       "dependencies": {
         "process-nextick-args": {
@@ -11372,13 +11372,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "string_decoder": {
@@ -11387,7 +11387,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -11422,9 +11422,9 @@
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       }
     },
     "string_decoder": {
@@ -11433,7 +11433,7 @@
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.0"
       }
     },
     "stringstream": {
@@ -11448,7 +11448,7 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -11457,7 +11457,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-bom-stream": {
@@ -11466,8 +11466,8 @@
       "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
       "dev": true,
       "requires": {
-        "first-chunk-stream": "2.0.0",
-        "strip-bom": "2.0.0"
+        "first-chunk-stream": "^2.0.0",
+        "strip-bom": "^2.0.0"
       }
     },
     "strip-eof": {
@@ -11482,7 +11482,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "4.0.1"
+        "get-stdin": "^4.0.1"
       }
     },
     "strip-json-comments": {
@@ -11497,8 +11497,8 @@
       "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.4.5"
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5"
       }
     },
     "supports-color": {
@@ -11513,13 +11513,13 @@
       "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
       "dev": true,
       "requires": {
-        "coa": "1.0.4",
-        "colors": "1.1.2",
-        "csso": "2.3.2",
-        "js-yaml": "3.7.0",
-        "mkdirp": "0.5.1",
-        "sax": "1.2.4",
-        "whet.extend": "0.9.9"
+        "coa": "~1.0.1",
+        "colors": "~1.1.2",
+        "csso": "~2.3.1",
+        "js-yaml": "~3.7.0",
+        "mkdirp": "~0.5.1",
+        "sax": "~1.2.1",
+        "whet.extend": "~0.9.9"
       }
     },
     "symbol-observable": {
@@ -11534,12 +11534,12 @@
       "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
-        "ajv": "5.5.2",
-        "ajv-keywords": "2.1.1",
-        "chalk": "2.3.2",
-        "lodash": "4.17.5",
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
         "slice-ansi": "1.0.0",
-        "string-width": "2.1.1"
+        "string-width": "^2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -11554,7 +11554,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -11563,9 +11563,9 @@
           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "has-flag": {
@@ -11586,7 +11586,7 @@
           "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0"
+            "is-fullwidth-code-point": "^2.0.0"
           }
         },
         "string-width": {
@@ -11595,8 +11595,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -11605,7 +11605,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -11614,7 +11614,7 @@
           "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -11631,9 +11631,9 @@
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.11",
-        "inherits": "2.0.3"
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
       }
     },
     "temp": {
@@ -11642,8 +11642,8 @@
       "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2",
-        "rimraf": "2.2.8"
+        "os-tmpdir": "^1.0.0",
+        "rimraf": "~2.2.6"
       },
       "dependencies": {
         "rimraf": {
@@ -11684,8 +11684,8 @@
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
       }
     },
     "thunky": {
@@ -11706,7 +11706,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "1.0.5"
+        "setimmediate": "^1.0.4"
       }
     },
     "tmp": {
@@ -11715,7 +11715,7 @@
       "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.1"
       }
     },
     "to-arraybuffer": {
@@ -11736,7 +11736,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -11745,7 +11745,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -11756,10 +11756,10 @@
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "regex-not": "1.0.2",
-        "safe-regex": "1.1.0"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "to-regex-range": {
@@ -11768,8 +11768,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       }
     },
     "tough-cookie": {
@@ -11777,7 +11777,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
       "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "requires": {
-        "punycode": "1.4.1"
+        "punycode": "^1.4.1"
       }
     },
     "trim-newlines": {
@@ -11798,7 +11798,7 @@
       "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
       "dev": true,
       "requires": {
-        "glob": "6.0.4"
+        "glob": "^6.0.4"
       },
       "dependencies": {
         "glob": {
@@ -11807,11 +11807,11 @@
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -11827,7 +11827,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.0.1"
       }
     },
     "tweetnacl": {
@@ -11842,7 +11842,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2"
+        "prelude-ls": "~1.1.2"
       }
     },
     "type-is": {
@@ -11852,7 +11852,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.18"
+        "mime-types": "~2.1.18"
       },
       "dependencies": {
         "mime-db": {
@@ -11867,7 +11867,7 @@
           "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
           "dev": true,
           "requires": {
-            "mime-db": "1.33.0"
+            "mime-db": "~1.33.0"
           }
         }
       }
@@ -11884,8 +11884,8 @@
       "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
       "dev": true,
       "requires": {
-        "commander": "2.13.0",
-        "source-map": "0.6.1"
+        "commander": "~2.13.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "commander": {
@@ -11908,14 +11908,14 @@
       "integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==",
       "dev": true,
       "requires": {
-        "cacache": "10.0.4",
-        "find-cache-dir": "1.0.0",
-        "schema-utils": "0.4.5",
-        "serialize-javascript": "1.5.0",
-        "source-map": "0.6.1",
-        "uglify-es": "3.3.9",
-        "webpack-sources": "1.1.0",
-        "worker-farm": "1.6.0"
+        "cacache": "^10.0.4",
+        "find-cache-dir": "^1.0.0",
+        "schema-utils": "^0.4.5",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "uglify-es": "^3.3.4",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
       },
       "dependencies": {
         "source-map": {
@@ -11938,10 +11938,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "get-value": "2.0.6",
-        "is-extendable": "0.1.1",
-        "set-value": "0.4.3"
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -11950,7 +11950,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "set-value": {
@@ -11959,10 +11959,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "2.0.1",
-            "is-extendable": "0.1.1",
-            "is-plain-object": "2.0.4",
-            "to-object-path": "0.3.0"
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
           }
         }
       }
@@ -11979,7 +11979,7 @@
       "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
       "dev": true,
       "requires": {
-        "macaddress": "0.2.8"
+        "macaddress": "^0.2.8"
       }
     },
     "uniqs": {
@@ -11994,7 +11994,7 @@
       "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
       "dev": true,
       "requires": {
-        "unique-slug": "2.0.0"
+        "unique-slug": "^2.0.0"
       }
     },
     "unique-slug": {
@@ -12003,7 +12003,7 @@
       "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
       "dev": true,
       "requires": {
-        "imurmurhash": "0.1.4"
+        "imurmurhash": "^0.1.4"
       }
     },
     "universalify": {
@@ -12024,8 +12024,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "0.3.1",
-        "isobject": "3.0.1"
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
       },
       "dependencies": {
         "has-value": {
@@ -12034,9 +12034,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "2.0.6",
-            "has-values": "0.1.4",
-            "isobject": "2.1.0"
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
           },
           "dependencies": {
             "isobject": {
@@ -12076,7 +12076,7 @@
       "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
       "dev": true,
       "requires": {
-        "punycode": "2.1.0"
+        "punycode": "^2.1.0"
       },
       "dependencies": {
         "punycode": {
@@ -12123,8 +12123,8 @@
       "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==",
       "dev": true,
       "requires": {
-        "querystringify": "2.0.0",
-        "requires-port": "1.0.0"
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "url-parse-lax": {
@@ -12133,7 +12133,7 @@
       "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
       "dev": true,
       "requires": {
-        "prepend-http": "2.0.0"
+        "prepend-http": "^2.0.0"
       },
       "dependencies": {
         "prepend-http": {
@@ -12156,7 +12156,7 @@
       "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
       "dev": true,
       "requires": {
-        "kind-of": "6.0.2"
+        "kind-of": "^6.0.2"
       }
     },
     "util": {
@@ -12203,9 +12203,9 @@
       "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.0-rc.32.tgz",
       "integrity": "sha512-UAczAn/OG2TpILOgm1bJ+JnJfAZpozS8BEPL8CLPiOnr0N1iDljCf14MtUVecaiYH21V/3996CmtxOUR9Q6Xbw==",
       "requires": {
-        "lodash.merge": "4.6.1",
-        "popper.js": "1.14.3",
-        "vue-resize": "0.4.4"
+        "lodash.merge": "^4.6.0",
+        "popper.js": "^1.12.9",
+        "vue-resize": "^0.4.3"
       }
     },
     "v8-compile-cache": {
@@ -12220,8 +12220,8 @@
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
       "dev": true,
       "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
+        "spdx-correct": "~1.0.0",
+        "spdx-expression-parse": "~1.0.0"
       }
     },
     "vary": {
@@ -12241,9 +12241,9 @@
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
+        "extsprintf": "^1.2.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -12259,8 +12259,8 @@
       "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
       "dev": true,
       "requires": {
-        "clone": "1.0.4",
-        "clone-stats": "0.0.1",
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
         "replace-ext": "0.0.1"
       }
     },
@@ -12270,12 +12270,12 @@
       "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0",
-        "strip-bom-stream": "2.0.0",
-        "vinyl": "1.2.0"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.3.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0",
+        "strip-bom-stream": "^2.0.0",
+        "vinyl": "^1.1.0"
       }
     },
     "vm-browserify": {
@@ -12304,12 +12304,12 @@
       "integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
       "dev": true,
       "requires": {
-        "debug": "3.1.0",
-        "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.4",
-        "esquery": "1.0.0",
-        "lodash": "4.17.5"
+        "debug": "^3.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.2",
+        "esquery": "^1.0.0",
+        "lodash": "^4.17.4"
       },
       "dependencies": {
         "debug": {
@@ -12335,11 +12335,11 @@
       "integrity": "sha512-vJuybfEVtYU2HZUqUHMiqBU1/9K2HFplbsRJMca6B2hPNQt5Kx24mrVK9Ej+vlgM+3zf+7WIKKQPjJwvdHbkdA==",
       "dev": true,
       "requires": {
-        "@vue/component-compiler-utils": "1.3.0",
-        "hash-sum": "1.0.2",
-        "loader-utils": "1.1.0",
-        "vue-hot-reload-api": "2.3.0",
-        "vue-style-loader": "4.1.0"
+        "@vue/component-compiler-utils": "^1.2.1",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
       }
     },
     "vue-resize": {
@@ -12358,8 +12358,8 @@
       "integrity": "sha512-IsSiXDrLW2QIjyBsCqa35e45l5AceMbJ2jO8DxoEQv75xu/UmtXkSC0ybESq/LpbmmIW47MAWDQvErUw+Hrz/A==",
       "dev": true,
       "requires": {
-        "hash-sum": "1.0.2",
-        "loader-utils": "1.1.0"
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.0.2"
       }
     },
     "vue-template-compiler": {
@@ -12368,8 +12368,8 @@
       "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==",
       "dev": true,
       "requires": {
-        "de-indent": "1.0.2",
-        "he": "1.1.1"
+        "de-indent": "^1.0.2",
+        "he": "^1.1.0"
       }
     },
     "vue-template-es2015-compiler": {
@@ -12383,7 +12383,7 @@
       "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.16.0.tgz",
       "integrity": "sha512-fr9gcWKXMJlzbbtJcrQs4kU7qdOZqd4SEpAcx+r0nykbW8AygZN0aKVpadEtI53T8A2azhzCdXMvEqrLuKE2fA==",
       "requires": {
-        "sortablejs": "1.7.0"
+        "sortablejs": "^1.7.0"
       }
     },
     "vuex": {
@@ -12397,9 +12397,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "2.0.3",
-        "graceful-fs": "4.1.11",
-        "neo-async": "2.5.1"
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
       }
     },
     "wbuf": {
@@ -12408,7 +12408,7 @@
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "1.0.1"
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "webassemblyjs": {
@@ -12421,7 +12421,7 @@
         "@webassemblyjs/validation": "1.4.3",
         "@webassemblyjs/wasm-parser": "1.4.3",
         "@webassemblyjs/wast-parser": "1.4.3",
-        "long": "3.2.0"
+        "long": "^3.2.0"
       }
     },
     "webpack": {
@@ -12433,25 +12433,25 @@
         "@webassemblyjs/ast": "1.4.3",
         "@webassemblyjs/wasm-edit": "1.4.3",
         "@webassemblyjs/wasm-parser": "1.4.3",
-        "acorn": "5.5.3",
-        "acorn-dynamic-import": "3.0.0",
-        "ajv": "6.5.0",
-        "ajv-keywords": "3.2.0",
-        "chrome-trace-event": "0.1.3",
-        "enhanced-resolve": "4.0.0",
-        "eslint-scope": "3.7.1",
-        "loader-runner": "2.3.0",
-        "loader-utils": "1.1.0",
-        "memory-fs": "0.4.1",
-        "micromatch": "3.1.10",
-        "mkdirp": "0.5.1",
-        "neo-async": "2.5.1",
-        "node-libs-browser": "2.1.0",
-        "schema-utils": "0.4.5",
-        "tapable": "1.0.0",
-        "uglifyjs-webpack-plugin": "1.2.5",
-        "watchpack": "1.6.0",
-        "webpack-sources": "1.1.0"
+        "acorn": "^5.0.0",
+        "acorn-dynamic-import": "^3.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^0.1.1",
+        "enhanced-resolve": "^4.0.0",
+        "eslint-scope": "^3.7.1",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^0.4.4",
+        "tapable": "^1.0.0",
+        "uglifyjs-webpack-plugin": "^1.2.4",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.0.1"
       },
       "dependencies": {
         "ajv": {
@@ -12460,10 +12460,10 @@
           "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1",
-            "uri-js": "4.2.1"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0",
+            "uri-js": "^4.2.1"
           }
         },
         "ajv-keywords": {
@@ -12490,7 +12490,7 @@
           "integrity": "sha512-jpKCA3HjsBfSDOEgxRDAxQCNyHfCPSbq57PqCkd3gAyBuPb3IWxw54EHncqESznIdqSetHfw3D7ylThu2Kcc9A==",
           "dev": true,
           "requires": {
-            "punycode": "2.1.0"
+            "punycode": "^2.1.0"
           }
         }
       }
@@ -12501,7 +12501,7 @@
       "integrity": "sha512-MGO0nVniCLFAQz1qv22zM02QPjcpAoJdy7ED0i3Zy7SY1IecgXCm460ib7H/Wq7e9oL5VL6S2BxaObxwIcag0g==",
       "dev": true,
       "requires": {
-        "jscodeshift": "0.4.1"
+        "jscodeshift": "^0.4.0"
       },
       "dependencies": {
         "arr-diff": {
@@ -12510,7 +12510,7 @@
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
           "requires": {
-            "arr-flatten": "1.1.0"
+            "arr-flatten": "^1.0.1"
           }
         },
         "array-unique": {
@@ -12537,9 +12537,9 @@
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
           "requires": {
-            "expand-range": "1.8.2",
-            "preserve": "0.2.0",
-            "repeat-element": "1.1.2"
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
           }
         },
         "esprima": {
@@ -12554,7 +12554,7 @@
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
           "requires": {
-            "is-posix-bracket": "0.1.1"
+            "is-posix-bracket": "^0.1.0"
           }
         },
         "extglob": {
@@ -12563,7 +12563,7 @@
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "^1.0.0"
           }
         },
         "is-extglob": {
@@ -12578,7 +12578,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "^1.0.0"
           }
         },
         "jscodeshift": {
@@ -12587,21 +12587,21 @@
           "integrity": "sha512-iOX6If+hsw0q99V3n31t4f5VlD1TQZddH08xbT65ZqA7T4Vkx68emrDZMUOLVvCEAJ6NpAk7DECe3fjC/t52AQ==",
           "dev": true,
           "requires": {
-            "async": "1.5.2",
-            "babel-plugin-transform-flow-strip-types": "6.22.0",
-            "babel-preset-es2015": "6.24.1",
-            "babel-preset-stage-1": "6.24.1",
-            "babel-register": "6.26.0",
-            "babylon": "6.18.0",
-            "colors": "1.1.2",
-            "flow-parser": "0.72.0",
-            "lodash": "4.17.5",
-            "micromatch": "2.3.11",
+            "async": "^1.5.0",
+            "babel-plugin-transform-flow-strip-types": "^6.8.0",
+            "babel-preset-es2015": "^6.9.0",
+            "babel-preset-stage-1": "^6.5.0",
+            "babel-register": "^6.9.0",
+            "babylon": "^6.17.3",
+            "colors": "^1.1.2",
+            "flow-parser": "^0.*",
+            "lodash": "^4.13.1",
+            "micromatch": "^2.3.7",
             "node-dir": "0.1.8",
-            "nomnom": "1.8.1",
-            "recast": "0.12.9",
-            "temp": "0.8.3",
-            "write-file-atomic": "1.3.4"
+            "nomnom": "^1.8.1",
+            "recast": "^0.12.5",
+            "temp": "^0.8.1",
+            "write-file-atomic": "^1.2.0"
           }
         },
         "kind-of": {
@@ -12610,7 +12610,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         },
         "micromatch": {
@@ -12619,19 +12619,19 @@
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
           "requires": {
-            "arr-diff": "2.0.0",
-            "array-unique": "0.2.1",
-            "braces": "1.8.5",
-            "expand-brackets": "0.1.5",
-            "extglob": "0.3.2",
-            "filename-regex": "2.0.1",
-            "is-extglob": "1.0.0",
-            "is-glob": "2.0.1",
-            "kind-of": "3.2.2",
-            "normalize-path": "2.1.1",
-            "object.omit": "2.0.1",
-            "parse-glob": "3.0.4",
-            "regex-cache": "0.4.4"
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
           }
         },
         "recast": {
@@ -12641,10 +12641,10 @@
           "dev": true,
           "requires": {
             "ast-types": "0.10.1",
-            "core-js": "2.5.1",
-            "esprima": "4.0.0",
-            "private": "0.1.8",
-            "source-map": "0.6.1"
+            "core-js": "^2.4.1",
+            "esprima": "~4.0.0",
+            "private": "~0.1.5",
+            "source-map": "~0.6.1"
           }
         },
         "source-map": {
@@ -12661,32 +12661,32 @@
       "integrity": "sha512-5AsKoL/Ccn8iTrwk3uErdyhetGH+c7VRQ7Itim2GL0IhBRq5rtojVDk00buMRmFmBpw1RvHXq97Gup965LbozA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1",
-        "cross-spawn": "6.0.5",
-        "diff": "3.5.0",
-        "enhanced-resolve": "4.0.0",
-        "envinfo": "4.4.2",
-        "glob-all": "3.1.0",
-        "global-modules": "1.0.0",
-        "got": "8.3.1",
-        "import-local": "1.0.0",
-        "inquirer": "5.2.0",
-        "interpret": "1.1.0",
-        "jscodeshift": "0.5.0",
-        "listr": "0.13.0",
-        "loader-utils": "1.1.0",
-        "lodash": "4.17.5",
-        "log-symbols": "2.2.0",
-        "mkdirp": "0.5.1",
-        "p-each-series": "1.0.0",
-        "p-lazy": "1.0.0",
-        "prettier": "1.11.1",
-        "supports-color": "5.4.0",
-        "v8-compile-cache": "1.1.2",
-        "webpack-addons": "1.1.5",
-        "yargs": "11.1.0",
-        "yeoman-environment": "2.1.1",
-        "yeoman-generator": "2.0.5"
+        "chalk": "^2.3.2",
+        "cross-spawn": "^6.0.5",
+        "diff": "^3.5.0",
+        "enhanced-resolve": "^4.0.0",
+        "envinfo": "^4.4.2",
+        "glob-all": "^3.1.0",
+        "global-modules": "^1.0.0",
+        "got": "^8.2.0",
+        "import-local": "^1.0.0",
+        "inquirer": "^5.1.0",
+        "interpret": "^1.0.4",
+        "jscodeshift": "^0.5.0",
+        "listr": "^0.13.0",
+        "loader-utils": "^1.1.0",
+        "lodash": "^4.17.5",
+        "log-symbols": "^2.2.0",
+        "mkdirp": "^0.5.1",
+        "p-each-series": "^1.0.0",
+        "p-lazy": "^1.0.0",
+        "prettier": "^1.5.3",
+        "supports-color": "^5.3.0",
+        "v8-compile-cache": "^1.1.2",
+        "webpack-addons": "^1.1.5",
+        "yargs": "^11.1.0",
+        "yeoman-environment": "^2.0.0",
+        "yeoman-generator": "^2.0.4"
       },
       "dependencies": {
         "ansi-escapes": {
@@ -12707,7 +12707,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -12716,9 +12716,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "cli-cursor": {
@@ -12727,7 +12727,7 @@
           "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
           "dev": true,
           "requires": {
-            "restore-cursor": "2.0.0"
+            "restore-cursor": "^2.0.0"
           }
         },
         "cross-spawn": {
@@ -12736,11 +12736,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "1.0.4",
-            "path-key": "2.0.1",
-            "semver": "5.5.0",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "figures": {
@@ -12749,7 +12749,7 @@
           "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5"
+            "escape-string-regexp": "^1.0.5"
           }
         },
         "inquirer": {
@@ -12758,19 +12758,19 @@
           "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
           "dev": true,
           "requires": {
-            "ansi-escapes": "3.1.0",
-            "chalk": "2.4.1",
-            "cli-cursor": "2.1.0",
-            "cli-width": "2.2.0",
-            "external-editor": "2.1.0",
-            "figures": "2.0.0",
-            "lodash": "4.17.5",
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^2.1.0",
+            "figures": "^2.0.0",
+            "lodash": "^4.3.0",
             "mute-stream": "0.0.7",
-            "run-async": "2.3.0",
-            "rxjs": "5.5.6",
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "through": "2.3.8"
+            "run-async": "^2.2.0",
+            "rxjs": "^5.5.2",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^4.0.0",
+            "through": "^2.3.6"
           }
         },
         "is-fullwidth-code-point": {
@@ -12785,23 +12785,23 @@
           "integrity": "sha1-ILsLowuuZg7oTMBQPfS+PVYjiH0=",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "cli-truncate": "0.2.1",
-            "figures": "1.7.0",
-            "indent-string": "2.1.0",
-            "is-observable": "0.2.0",
-            "is-promise": "2.1.0",
-            "is-stream": "1.1.0",
-            "listr-silent-renderer": "1.1.1",
-            "listr-update-renderer": "0.4.0",
-            "listr-verbose-renderer": "0.4.1",
-            "log-symbols": "1.0.2",
-            "log-update": "1.0.2",
-            "ora": "0.2.3",
-            "p-map": "1.2.0",
-            "rxjs": "5.5.6",
-            "stream-to-observable": "0.2.0",
-            "strip-ansi": "3.0.1"
+            "chalk": "^1.1.3",
+            "cli-truncate": "^0.2.1",
+            "figures": "^1.7.0",
+            "indent-string": "^2.1.0",
+            "is-observable": "^0.2.0",
+            "is-promise": "^2.1.0",
+            "is-stream": "^1.1.0",
+            "listr-silent-renderer": "^1.1.1",
+            "listr-update-renderer": "^0.4.0",
+            "listr-verbose-renderer": "^0.4.0",
+            "log-symbols": "^1.0.2",
+            "log-update": "^1.0.2",
+            "ora": "^0.2.3",
+            "p-map": "^1.1.1",
+            "rxjs": "^5.4.2",
+            "stream-to-observable": "^0.2.0",
+            "strip-ansi": "^3.0.1"
           },
           "dependencies": {
             "ansi-regex": {
@@ -12822,11 +12822,11 @@
               "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
               "dev": true,
               "requires": {
-                "ansi-styles": "2.2.1",
-                "escape-string-regexp": "1.0.5",
-                "has-ansi": "2.0.0",
-                "strip-ansi": "3.0.1",
-                "supports-color": "2.0.0"
+                "ansi-styles": "^2.2.1",
+                "escape-string-regexp": "^1.0.2",
+                "has-ansi": "^2.0.0",
+                "strip-ansi": "^3.0.0",
+                "supports-color": "^2.0.0"
               }
             },
             "figures": {
@@ -12835,8 +12835,8 @@
               "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
               "dev": true,
               "requires": {
-                "escape-string-regexp": "1.0.5",
-                "object-assign": "4.1.1"
+                "escape-string-regexp": "^1.0.5",
+                "object-assign": "^4.1.0"
               }
             },
             "log-symbols": {
@@ -12845,7 +12845,7 @@
               "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
               "dev": true,
               "requires": {
-                "chalk": "1.1.3"
+                "chalk": "^1.0.0"
               }
             },
             "strip-ansi": {
@@ -12854,7 +12854,7 @@
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "2.1.1"
+                "ansi-regex": "^2.0.0"
               }
             },
             "supports-color": {
@@ -12871,14 +12871,14 @@
           "integrity": "sha1-NE2YDaLKLosUW6MFkI8yrj9MyKc=",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "cli-truncate": "0.2.1",
-            "elegant-spinner": "1.0.1",
-            "figures": "1.7.0",
-            "indent-string": "3.2.0",
-            "log-symbols": "1.0.2",
-            "log-update": "1.0.2",
-            "strip-ansi": "3.0.1"
+            "chalk": "^1.1.3",
+            "cli-truncate": "^0.2.1",
+            "elegant-spinner": "^1.0.1",
+            "figures": "^1.7.0",
+            "indent-string": "^3.0.0",
+            "log-symbols": "^1.0.2",
+            "log-update": "^1.0.2",
+            "strip-ansi": "^3.0.1"
           },
           "dependencies": {
             "ansi-regex": {
@@ -12899,11 +12899,11 @@
               "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
               "dev": true,
               "requires": {
-                "ansi-styles": "2.2.1",
-                "escape-string-regexp": "1.0.5",
-                "has-ansi": "2.0.0",
-                "strip-ansi": "3.0.1",
-                "supports-color": "2.0.0"
+                "ansi-styles": "^2.2.1",
+                "escape-string-regexp": "^1.0.2",
+                "has-ansi": "^2.0.0",
+                "strip-ansi": "^3.0.0",
+                "supports-color": "^2.0.0"
               }
             },
             "figures": {
@@ -12912,8 +12912,8 @@
               "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
               "dev": true,
               "requires": {
-                "escape-string-regexp": "1.0.5",
-                "object-assign": "4.1.1"
+                "escape-string-regexp": "^1.0.5",
+                "object-assign": "^4.1.0"
               }
             },
             "indent-string": {
@@ -12928,7 +12928,7 @@
               "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
               "dev": true,
               "requires": {
-                "chalk": "1.1.3"
+                "chalk": "^1.0.0"
               }
             },
             "strip-ansi": {
@@ -12937,7 +12937,7 @@
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "2.1.1"
+                "ansi-regex": "^2.0.0"
               }
             },
             "supports-color": {
@@ -12954,7 +12954,7 @@
           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1"
+            "chalk": "^2.0.1"
           }
         },
         "onetime": {
@@ -12963,7 +12963,7 @@
           "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
           "dev": true,
           "requires": {
-            "mimic-fn": "1.1.0"
+            "mimic-fn": "^1.0.0"
           }
         },
         "restore-cursor": {
@@ -12972,8 +12972,8 @@
           "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
           "dev": true,
           "requires": {
-            "onetime": "2.0.1",
-            "signal-exit": "3.0.2"
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
           }
         },
         "semver": {
@@ -12988,7 +12988,7 @@
           "integrity": "sha1-WdbqOT2HwsDdrBCqDVYbxrpvDhA=",
           "dev": true,
           "requires": {
-            "any-observable": "0.2.0"
+            "any-observable": "^0.2.0"
           }
         },
         "string-width": {
@@ -12997,8 +12997,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -13007,7 +13007,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -13016,7 +13016,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -13027,13 +13027,13 @@
       "integrity": "sha512-I6Mmy/QjWU/kXwCSFGaiOoL5YEQIVmbb0o45xMoCyQAg/mClqZVTcsX327sPfekDyJWpCxb+04whNyLOIxpJdQ==",
       "dev": true,
       "requires": {
-        "loud-rejection": "1.6.0",
-        "memory-fs": "0.4.1",
-        "mime": "2.3.1",
-        "path-is-absolute": "1.0.1",
-        "range-parser": "1.2.0",
-        "url-join": "4.0.0",
-        "webpack-log": "1.2.0"
+        "loud-rejection": "^1.6.0",
+        "memory-fs": "~0.4.1",
+        "mime": "^2.1.0",
+        "path-is-absolute": "^1.0.0",
+        "range-parser": "^1.0.3",
+        "url-join": "^4.0.0",
+        "webpack-log": "^1.0.1"
       },
       "dependencies": {
         "mime": {
@@ -13051,32 +13051,32 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "array-includes": "3.0.3",
-        "bonjour": "3.5.0",
-        "chokidar": "2.0.3",
-        "compression": "1.7.2",
-        "connect-history-api-fallback": "1.5.0",
-        "debug": "3.1.0",
-        "del": "3.0.0",
-        "express": "4.16.3",
-        "html-entities": "1.2.1",
-        "http-proxy-middleware": "0.18.0",
-        "import-local": "1.0.0",
+        "array-includes": "^3.0.3",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.0.0",
+        "compression": "^1.5.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "debug": "^3.1.0",
+        "del": "^3.0.0",
+        "express": "^4.16.2",
+        "html-entities": "^1.2.0",
+        "http-proxy-middleware": "~0.18.0",
+        "import-local": "^1.0.0",
         "internal-ip": "1.2.0",
-        "ip": "1.1.5",
-        "killable": "1.0.0",
-        "loglevel": "1.6.1",
-        "opn": "5.3.0",
-        "portfinder": "1.0.13",
-        "selfsigned": "1.10.3",
-        "serve-index": "1.9.1",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "selfsigned": "^1.9.1",
+        "serve-index": "^1.7.2",
         "sockjs": "0.3.19",
         "sockjs-client": "1.1.4",
-        "spdy": "3.4.7",
-        "strip-ansi": "3.0.1",
-        "supports-color": "5.4.0",
+        "spdy": "^3.4.1",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^5.1.0",
         "webpack-dev-middleware": "3.1.3",
-        "webpack-log": "1.2.0",
+        "webpack-log": "^1.1.2",
         "yargs": "11.0.0"
       },
       "dependencies": {
@@ -13092,9 +13092,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -13103,7 +13103,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -13123,7 +13123,7 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -13138,9 +13138,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
         "string-width": {
@@ -13149,8 +13149,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -13159,7 +13159,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -13170,7 +13170,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         },
         "which-module": {
@@ -13185,18 +13185,18 @@
           "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
           "dev": true,
           "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "9.0.2"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^9.0.2"
           }
         }
       }
@@ -13207,10 +13207,10 @@
       "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1",
-        "log-symbols": "2.2.0",
-        "loglevelnext": "1.0.5",
-        "uuid": "3.2.1"
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "loglevelnext": "^1.0.1",
+        "uuid": "^3.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -13219,7 +13219,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -13228,9 +13228,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "log-symbols": {
@@ -13239,7 +13239,7 @@
           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1"
+            "chalk": "^2.0.1"
           }
         },
         "supports-color": {
@@ -13248,7 +13248,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -13259,8 +13259,8 @@
       "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
       "dev": true,
       "requires": {
-        "source-list-map": "2.0.0",
-        "source-map": "0.6.1"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -13277,8 +13277,8 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": "0.4.12",
-        "websocket-extensions": "0.1.3"
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
       }
     },
     "websocket-extensions": {
@@ -13299,7 +13299,7 @@
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "which-module": {
@@ -13314,7 +13314,7 @@
       "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "^1.0.2"
       }
     },
     "worker-farm": {
@@ -13323,7 +13323,7 @@
       "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
-        "errno": "0.1.7"
+        "errno": "~0.1.7"
       }
     },
     "wrap-ansi": {
@@ -13332,8 +13332,8 @@
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       }
     },
     "wrappy": {
@@ -13348,7 +13348,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "0.5.1"
+        "mkdirp": "^0.5.1"
       }
     },
     "write-file-atomic": {
@@ -13357,9 +13357,9 @@
       "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "imurmurhash": "0.1.4",
-        "slide": "1.1.6"
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "slide": "^1.1.5"
       }
     },
     "xtend": {
@@ -13386,18 +13386,18 @@
       "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
       "dev": true,
       "requires": {
-        "cliui": "4.1.0",
-        "decamelize": "1.2.0",
-        "find-up": "2.1.0",
-        "get-caller-file": "1.0.2",
-        "os-locale": "2.1.0",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "2.1.1",
-        "which-module": "2.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "9.0.2"
+        "cliui": "^4.0.0",
+        "decamelize": "^1.1.1",
+        "find-up": "^2.1.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^2.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^9.0.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13412,9 +13412,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "find-up": {
@@ -13423,7 +13423,7 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -13438,9 +13438,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
         "string-width": {
@@ -13449,8 +13449,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -13459,7 +13459,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "which-module": {
@@ -13476,7 +13476,7 @@
       "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
       "dev": true,
       "requires": {
-        "camelcase": "4.1.0"
+        "camelcase": "^4.1.0"
       }
     },
     "yauzl": {
@@ -13485,8 +13485,8 @@
       "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13",
-        "fd-slicer": "1.0.1"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.0.1"
       }
     },
     "yeoman-environment": {
@@ -13495,21 +13495,21 @@
       "integrity": "sha512-IBLwCUrJrDxBYuwdYm1wuF3O/CR2LpXR0rFS684QOrU6x69DPPrsdd20dZOFaedZ/M9sON7po73WhO3I1CbgNQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1",
-        "cross-spawn": "6.0.5",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "globby": "8.0.1",
-        "grouped-queue": "0.3.3",
-        "inquirer": "5.2.0",
-        "is-scoped": "1.0.0",
-        "lodash": "4.17.10",
-        "log-symbols": "2.2.0",
-        "mem-fs": "1.1.3",
-        "strip-ansi": "4.0.0",
-        "text-table": "0.2.0",
-        "untildify": "3.0.2"
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^3.1.0",
+        "diff": "^3.3.1",
+        "escape-string-regexp": "^1.0.2",
+        "globby": "^8.0.1",
+        "grouped-queue": "^0.3.3",
+        "inquirer": "^5.2.0",
+        "is-scoped": "^1.0.0",
+        "lodash": "^4.17.10",
+        "log-symbols": "^2.1.0",
+        "mem-fs": "^1.1.0",
+        "strip-ansi": "^4.0.0",
+        "text-table": "^0.2.0",
+        "untildify": "^3.0.2"
       },
       "dependencies": {
         "ansi-escapes": {
@@ -13530,7 +13530,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -13539,9 +13539,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "cli-cursor": {
@@ -13550,7 +13550,7 @@
           "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
           "dev": true,
           "requires": {
-            "restore-cursor": "2.0.0"
+            "restore-cursor": "^2.0.0"
           }
         },
         "cross-spawn": {
@@ -13559,11 +13559,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "1.0.4",
-            "path-key": "2.0.1",
-            "semver": "5.5.0",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "debug": {
@@ -13581,7 +13581,7 @@
           "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5"
+            "escape-string-regexp": "^1.0.5"
           }
         },
         "globby": {
@@ -13590,13 +13590,13 @@
           "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
           "dev": true,
           "requires": {
-            "array-union": "1.0.2",
-            "dir-glob": "2.0.0",
-            "fast-glob": "2.2.1",
-            "glob": "7.1.2",
-            "ignore": "3.3.7",
-            "pify": "3.0.0",
-            "slash": "1.0.0"
+            "array-union": "^1.0.1",
+            "dir-glob": "^2.0.0",
+            "fast-glob": "^2.0.2",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
           }
         },
         "inquirer": {
@@ -13605,19 +13605,19 @@
           "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
           "dev": true,
           "requires": {
-            "ansi-escapes": "3.1.0",
-            "chalk": "2.4.1",
-            "cli-cursor": "2.1.0",
-            "cli-width": "2.2.0",
-            "external-editor": "2.1.0",
-            "figures": "2.0.0",
-            "lodash": "4.17.10",
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^2.1.0",
+            "figures": "^2.0.0",
+            "lodash": "^4.3.0",
             "mute-stream": "0.0.7",
-            "run-async": "2.3.0",
-            "rxjs": "5.5.6",
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "through": "2.3.8"
+            "run-async": "^2.2.0",
+            "rxjs": "^5.5.2",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^4.0.0",
+            "through": "^2.3.6"
           }
         },
         "is-fullwidth-code-point": {
@@ -13638,7 +13638,7 @@
           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1"
+            "chalk": "^2.0.1"
           }
         },
         "onetime": {
@@ -13647,7 +13647,7 @@
           "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
           "dev": true,
           "requires": {
-            "mimic-fn": "1.1.0"
+            "mimic-fn": "^1.0.0"
           }
         },
         "pify": {
@@ -13662,8 +13662,8 @@
           "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
           "dev": true,
           "requires": {
-            "onetime": "2.0.1",
-            "signal-exit": "3.0.2"
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
           }
         },
         "semver": {
@@ -13678,8 +13678,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -13688,7 +13688,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -13697,7 +13697,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -13708,31 +13708,31 @@
       "integrity": "sha512-rV6tJ8oYzm4mmdF2T3wjY+Q42jKF2YiiD0VKfJ8/0ZYwmhCKC9Xs2346HVLPj/xE13i68psnFJv7iS6gWRkeAg==",
       "dev": true,
       "requires": {
-        "async": "2.6.0",
-        "chalk": "2.4.1",
-        "cli-table": "0.3.1",
-        "cross-spawn": "6.0.5",
-        "dargs": "5.1.0",
-        "dateformat": "3.0.3",
-        "debug": "3.1.0",
-        "detect-conflict": "1.0.1",
-        "error": "7.0.2",
-        "find-up": "2.1.0",
-        "github-username": "4.1.0",
-        "istextorbinary": "2.2.1",
-        "lodash": "4.17.10",
-        "make-dir": "1.1.0",
-        "mem-fs-editor": "4.0.2",
-        "minimist": "1.2.0",
-        "pretty-bytes": "4.0.2",
-        "read-chunk": "2.1.0",
-        "read-pkg-up": "3.0.0",
-        "rimraf": "2.6.2",
-        "run-async": "2.3.0",
-        "shelljs": "0.8.2",
-        "text-table": "0.2.0",
-        "through2": "2.0.3",
-        "yeoman-environment": "2.1.1"
+        "async": "^2.6.0",
+        "chalk": "^2.3.0",
+        "cli-table": "^0.3.1",
+        "cross-spawn": "^6.0.5",
+        "dargs": "^5.1.0",
+        "dateformat": "^3.0.3",
+        "debug": "^3.1.0",
+        "detect-conflict": "^1.0.0",
+        "error": "^7.0.2",
+        "find-up": "^2.1.0",
+        "github-username": "^4.0.0",
+        "istextorbinary": "^2.2.1",
+        "lodash": "^4.17.10",
+        "make-dir": "^1.1.0",
+        "mem-fs-editor": "^4.0.0",
+        "minimist": "^1.2.0",
+        "pretty-bytes": "^4.0.2",
+        "read-chunk": "^2.1.0",
+        "read-pkg-up": "^3.0.0",
+        "rimraf": "^2.6.2",
+        "run-async": "^2.0.0",
+        "shelljs": "^0.8.0",
+        "text-table": "^0.2.0",
+        "through2": "^2.0.0",
+        "yeoman-environment": "^2.0.5"
       },
       "dependencies": {
         "ansi-styles": {
@@ -13741,7 +13741,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -13750,9 +13750,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "cross-spawn": {
@@ -13761,11 +13761,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "1.0.4",
-            "path-key": "2.0.1",
-            "semver": "5.5.0",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "debug": {
@@ -13783,7 +13783,7 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "load-json-file": {
@@ -13792,10 +13792,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
         "lodash": {
@@ -13816,8 +13816,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.2"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         },
         "path-type": {
@@ -13826,7 +13826,7 @@
           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
-            "pify": "3.0.0"
+            "pify": "^3.0.0"
           }
         },
         "pify": {
@@ -13841,9 +13841,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
           }
         },
         "read-pkg-up": {
@@ -13852,8 +13852,8 @@
           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
           "dev": true,
           "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "3.0.0"
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
           }
         },
         "semver": {
@@ -13874,7 +13874,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index c50ac03a8..a7d933067 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -132,7 +132,7 @@ class Admin {
 		global $TAINACAN_BASE_URL;
 		
 		$Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
-		$Tainacan_Fields      = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata      = \Tainacan\Repositories\Metadata::get_instance();
 		$Tainacan_Filters     = \Tainacan\Repositories\Filters::get_instance();
 		$Tainacan_Items       = \Tainacan\Repositories\Items::get_instance();
 		$Tainacan_Taxonomies  = \Tainacan\Repositories\Taxonomies::get_instance();
@@ -141,7 +141,7 @@ class Admin {
 
 		$entities_labels = [
 			'collections' => $Tainacan_Collections->get_cpt_labels(),
-			'fields'      => $Tainacan_Fields->get_cpt_labels(),
+			'metadata'      => $Tainacan_Metadata->get_cpt_labels(),
 			'filters'     => $Tainacan_Filters->get_cpt_labels(),
 			'items'       => $Tainacan_Items->get_cpt_labels(),
 			'taxonomies'  => $Tainacan_Taxonomies->get_cpt_labels(),
@@ -183,21 +183,21 @@ class Admin {
 
 		$maps = [
 			'collections' => $Tainacan_Collections->get_map(),
-			'fields'      => $Tainacan_Fields->get_map(),
+			'metadata'      => $Tainacan_Metadata->get_map(),
 			'filters'     => $Tainacan_Filters->get_map(),
 			'items'       => $Tainacan_Items->get_map(),
 			'taxonomies'  => $Tainacan_Taxonomies->get_map(),
 		];
 
-		$field_types = $Tainacan_Fields->fetch_field_types();
+		$metadatum_types = $Tainacan_Metadata->fetch_metadatum_types();
 
 		foreach( $maps as $type => $map ){
-		    foreach ( $map as $field => $details){
-                $settings['i18n']['helpers_label'][$type][$field] = [ 'title' => $details['title'], 'description' => $details['description'] ];
+		    foreach ( $map as $metadatum => $details){
+                $settings['i18n']['helpers_label'][$type][$metadatum] = [ 'title' => $details['title'], 'description' => $details['description'] ];
             }
         }
-        foreach ( $field_types as $index => $field_type){
-		    $class = new $field_type;
+        foreach ( $metadatum_types as $index => $metadatum_type){
+		    $class = new $metadatum_type;
             $settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels();
         }
 		
diff --git a/src/admin/components/advanced-search/advanced-search.vue b/src/admin/components/advanced-search/advanced-search.vue
index 5202aa055..1572b4827 100644
--- a/src/admin/components/advanced-search/advanced-search.vue
+++ b/src/admin/components/advanced-search/advanced-search.vue
@@ -3,8 +3,8 @@
         <div class="columns is-multiline tnc-advanced-search-container">
 
             <div
-                    v-for="searchField in totalSearchMetadata"
-                    :key="searchField"
+                    v-for="searchMetadatum in totalSearchMetadata"
+                    :key="searchMetadatum"
                     class="field column is-12 tainacan-form">
 
                 <b-field
@@ -12,7 +12,7 @@
                         grouped>
                     <b-field class="column">
                         <b-select
-                                @input="addToAdvancedSearchQuery($event, 'field_id', searchField)">
+                                @input="addToAdvancedSearchQuery($event, 'field_id', searchMetadatum)">
                             <option
                                     v-for="metadata in metadataList"
                                     v-if="metadata.enabled"
@@ -24,12 +24,12 @@
 
                     <b-field class="column is-two-thirds">
                         <b-input
-                                @input="addValueToAdvancedSearchQuery($event, 'value', searchField)"/>
+                                @input="addValueToAdvancedSearchQuery($event, 'value', searchMetadatum)"/>
                     </b-field>
 
                     <b-field class="column">
                         <b-select
-                                @input="addToAdvancedSearchQuery($event, 'compare', searchField)">
+                                @input="addToAdvancedSearchQuery($event, 'compare', searchMetadatum)">
                             <option
                                     v-for="(opt, key) in compare"
                                     :value="key"
@@ -52,7 +52,7 @@
                     <a
                             @click="addSearchMetadata"
                             class="is-secondary is-small">
-                        {{ $i18n.get('add_more_one_search_field') }}</a>
+                        {{ $i18n.get('add_more_one_search_metadatum') }}</a>
                 </div>
 
             </div>
@@ -71,7 +71,7 @@
                 </div>
             </div>
         </div>
-        <pre>{{ advancedSearchQuery }}</pre>
+        <!-- <pre>{{ advancedSearchQuery }}</pre> -->
     </div>
 </template>
 
diff --git a/src/admin/components/edition/category-edition-form.vue b/src/admin/components/edition/category-edition-form.vue
index 9cf10482a..a01ebcd6d 100644
--- a/src/admin/components/edition/category-edition-form.vue
+++ b/src/admin/components/edition/category-edition-form.vue
@@ -370,38 +370,4 @@
     }
 </script>
 
-<style lang="scss" scoped>
-
-    .thumbnail-field {
-        width: 128px;
-        height: 128px;
-        max-width: 128px;
-        max-height: 128px;
-
-        .content {
-            padding: 10px;
-            font-size: 0.8em;
-        }
-        img {
-            bottom: 0;
-            position: absolute;
-        }
-
-        .thumbnail-buttons-row {
-            display: none;
-        }
-        &:hover {
-            .thumbnail-buttons-row {
-                display: inline-block;
-                position: relative;
-                bottom: 31px;
-                background-color: rgba(255,255,255,0.8);
-                padding: 2px 8px;
-                border-radius: 0px 4px 0px 0px;
-            }
-        }
-    }
-
-</style>
-
 
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index d621d89c1..615cf338c 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -47,7 +47,7 @@
                     <b-field 
                         :addons="false"
                         :label="$i18n.get('label_header_image')">
-                        <div class="thumbnail-field">                    
+                        <div class="thumbnail-field">
                             <a 
                                     class="button is-rounred is-secondary"
                                     id="button-edit-header-image" 
@@ -438,8 +438,8 @@ export default {
             'fetchUsers',
             'fetchCollectionsForParent'
         ]),
-        ...mapActions('fields', [
-            'fetchFields'
+        ...mapActions('metadata', [
+            'fetchMetadata'
         ]),
         onSubmit() {
             this.isLoading = true;
diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index b3c0a036c..4f5c3c62a 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -10,7 +10,7 @@
             <label class="label is-inline">
                 {{ $i18n.get('label_name') }} 
                 <span 
-                        class="required-field-asterisk" 
+                        class="required-metadatum-asterisk"
                         :class="formErrors['name'] != undefined ? 'is-danger' : ''">*</span> 
                 <help-button 
                         :title="$i18n.getHelperTitle('filters', 'name')" 
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 9e2047c19..b0e239911 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -16,7 +16,7 @@
                     <!-- Status -------------------------------- -->
                     <div class="section-label">
                         <label>{{ $i18n.get('label_status') }}</label>
-                        <span class="required-field-asterisk">*</span>
+                        <span class="required-metadatum-asterisk">*</span>
                         <help-button
                                 :title="$i18n.getHelperTitle('items', 'status')"
                                 :message="$i18n.getHelperMessage('items', 'status')"/>
@@ -302,7 +302,7 @@
                 <div 
                         class="column is-4-5"
                         v-show="!isMetadataColumnCompressed">
-                    <label class="section-label">{{ $i18n.get('fields') }}</label>
+                    <label class="section-label">{{ $i18n.get('metadata') }}</label>
                     <br>
                     <a
                             class="collapse-all"
@@ -313,12 +313,12 @@
                                 :icon=" collapseAll ? 'menu-down' : 'menu-right'" />
                     </a>
 
-                    <!-- Fields from Collection-------------------------------- -->
+                    <!-- Metadata from Collection-------------------------------- -->
                     <tainacan-form-item
-                            v-for="(field, index) of fieldList"
+                            v-for="(metadatum, index) of metadatumList"
                             :key="index"
-                            :field="field"
-                            :is-collapsed="fieldCollapses[index]" 
+                            :metadatum="metadatum"
+                            :is-collapsed="metadatumCollapses[index]"
                             @changeCollapse="onChangeCollapse($event, index)"/>
 
                 </div>
@@ -348,7 +348,7 @@ export default {
             collectionId: Number,
             isLoading: false,
             isMetadataColumnCompressed: false,
-            fieldCollapses: [],
+            metadatumCollapses: [],
             collapseAll: false,
             form: {
                 collectionId: Number,
@@ -383,8 +383,8 @@ export default {
         }
     },
     computed: {
-        fieldList() {
-            return JSON.parse(JSON.stringify(this.getFields()));
+        metadatumList() {
+            return JSON.parse(JSON.stringify(this.getMetadata()));
         },
         attachmentsList(){
             return this.getAttachments();
@@ -398,16 +398,16 @@ export default {
             'sendItem',
             'updateItem',
             'updateItemDocument',
-            'fetchFields',
-            'sendField',
+            'fetchMetadata',
+            'sendMetadatum',
             'fetchItem',
-            'cleanFields',
+            'cleanMetadata',
             'sendAttachments',
             'updateThumbnail',
             'fetchAttachments'
         ]),
         ...mapGetters('item',[
-            'getFields',
+            'getMetadata',
             'getAttachments'
         ]),
         onSubmit() {
@@ -431,8 +431,8 @@ export default {
             })
             .catch((errors) => {
                 for (let error of errors.errors) {
-                    for (let field of Object.keys(error)){
-                       eventBus.errors.push({ field_id: field, errors: error[field]});
+                    for (let metadatum of Object.keys(error)){
+                       eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                     }
                 }
                 this.formErrorMessage = errors.error_message;
@@ -466,11 +466,11 @@ export default {
             .catch(error => this.$console.error(error));
         },
         loadMetadata() {
-            // Obtains Item Field
-            this.fetchFields(this.itemId).then((fields) => {
+            // Obtains Item Metadatum
+            this.fetchMetadata(this.itemId).then((metadata) => {
                 this.isLoading = false;
-                for (let field of fields) {
-                    this.fieldCollapses.push(field.field.required == 'yes');
+                for (let metadatum of metadata) {
+                    this.metadatumCollapses.push(metadatum.metadatum.required == 'yes');
                 }
             });
         },
@@ -492,8 +492,8 @@ export default {
             })
             .catch((errors) => {
                 for (let error of errors.errors) {
-                    for (let field of Object.keys(error)){
-                       eventBus.errors.push({ field_id: field, errors: error[field]});
+                    for (let metadatum of Object.keys(error)){
+                       eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                     }
                 }
                 this.formErrorMessage = errors.error_message;
@@ -524,8 +524,8 @@ export default {
             })
             .catch((errors) => {
                 for (let error of errors.errors) {
-                    for (let field of Object.keys(error)){
-                       eventBus.errors.push({ field_id: field, errors: error[field]});
+                    for (let metadatum of Object.keys(error)){
+                       eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                     }
                 }
                 this.formErrorMessage = errors.error_message;
@@ -578,8 +578,8 @@ export default {
                         })
                         .catch((errors) => {
                             for (let error of errors.errors) {
-                                for (let field of Object.keys(error)){
-                                eventBus.errors.push({ field_id: field, errors: error[field]});
+                                for (let metadatum of Object.keys(error)){
+                                eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                                 }
                             }
                             this.formErrorMessage = errors.error_message;
@@ -623,17 +623,17 @@ export default {
         toggleCollapseAll() {
             this.collapseAll = !this.collapseAll;
 
-            for (let i = 0; i < this.fieldCollapses.length; i++)
-                this.fieldCollapses[i] = this.collapseAll;
+            for (let i = 0; i < this.metadatumCollapses.length; i++)
+                this.metadatumCollapses[i] = this.collapseAll;
 
         },
         onChangeCollapse(event, index) {
-            this.fieldCollapses.splice(index, 1, event);
+            this.metadatumCollapses.splice(index, 1, event);
         }
     },
     created(){
         // Obtains collection ID
-        this.cleanFields();
+        this.cleanMetadata();
         eventBus.clearAllErrors();
         this.formErrorMessage = '';
         this.collectionId = this.$route.params.collectionId;
@@ -745,7 +745,7 @@ export default {
             padding-right: $page-side-padding;
             transition: all 0.6s;
 
-            .field {
+            .metadatum {
                     padding: 10px 0px 10px 25px;
             }
 
diff --git a/src/admin/components/edition/field-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
similarity index 82%
rename from src/admin/components/edition/field-edition-form.vue
rename to src/admin/components/edition/metadatum-edition-form.vue
index ac5bcf3d5..a4ab8c6f0 100644
--- a/src/admin/components/edition/field-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -1,6 +1,6 @@
 <template>
     <form
-            id="fieldEditForm"
+            id="metadatumEditForm"
             class="tainacan-form"
             @submit.prevent="saveEdition(editForm)">
 
@@ -11,11 +11,11 @@
             <label class="label is-inline">
                 {{ $i18n.get('label_name') }}
                 <span
-                        class="required-field-asterisk"
+                        class="required-metadatum-asterisk"
                         :class="formErrors['name'] != undefined ? 'is-danger' : ''">*</span>
                 <help-button
-                        :title="$i18n.getHelperTitle('fields', 'name')"
-                        :message="$i18n.getHelperMessage('fields', 'name')"/>
+                        :title="$i18n.getHelperTitle('metadata', 'name')"
+                        :message="$i18n.getHelperMessage('metadata', 'name')"/>
             </label>
             <b-input
                     :class="{'has-content': editForm.name != undefined && editForm.name != ''}"
@@ -31,8 +31,8 @@
             <label class="label is-inline">
                 {{ $i18n.get('label_description') }}
                 <help-button
-                        :title="$i18n.getHelperTitle('fields', 'description')"
-                        :message="$i18n.getHelperMessage('fields', 'description')"/>
+                        :title="$i18n.getHelperTitle('metadata', 'description')"
+                        :message="$i18n.getHelperMessage('metadata', 'description')"/>
             </label>
             <b-input
                     :class="{'has-content': editForm.description != undefined && editForm.description != ''}"
@@ -49,8 +49,8 @@
             <label class="label is-inline">
                 {{ $i18n.get('label_status') }}
                 <help-button
-                        :title="$i18n.getHelperTitle('fields', 'status')"
-                        :message="$i18n.getHelperMessage('fields', 'status')"/>
+                        :title="$i18n.getHelperTitle('metadata', 'status')"
+                        :message="$i18n.getHelperMessage('metadata', 'status')"/>
             </label>
             <b-field>
                 <b-radio
@@ -84,8 +84,8 @@
             <label class="label is-inline">
                 {{ $i18n.get('label_display') }}
                 <help-button
-                        :title="$i18n.getHelperTitle('fields', 'display')"
-                        :message="$i18n.getHelperMessage('fields', 'display')"/>
+                        :title="$i18n.getHelperTitle('metadata', 'display')"
+                        :message="$i18n.getHelperMessage('metadata', 'display')"/>
 
             </label>
 
@@ -139,13 +139,13 @@
                         name="required">
                     {{ $i18n.get('label_required') }}
                     <help-button
-                            :title="$i18n.getHelperTitle('fields', 'required')"
-                            :message="$i18n.getHelperMessage('fields', 'required')"/>
+                            :title="$i18n.getHelperTitle('metadata', 'required')"
+                            :message="$i18n.getHelperMessage('metadata', 'required')"/>
                 </b-checkbox>
             </b-field>
 
             <b-field
-                    v-if="!originalField.field_type_object.core"
+                    v-if="!originalMetadatum.metadatum_type_object.core"
                     :type="formErrors['multiple'] != undefined ? 'is-danger' : ''"
                     :message="formErrors['multiple'] != undefined ? formErrors['multiple'] : ''">
                 <b-checkbox
@@ -158,8 +158,8 @@
                         name="multiple">
                     {{ $i18n.get('label_allow_multiple') }}
                     <help-button
-                            :title="$i18n.getHelperTitle('fields', 'multiple')"
-                            :message="$i18n.getHelperMessage('fields', 'multiple')"/>
+                            :title="$i18n.getHelperTitle('metadata', 'multiple')"
+                            :message="$i18n.getHelperMessage('metadata', 'multiple')"/>
                 </b-checkbox>    
             </b-field>
 
@@ -176,18 +176,18 @@
                         name="collecion_key">
                     {{ $i18n.get('label_unique_value') }}
                     <help-button
-                            :title="$i18n.getHelperTitle('fields', 'unique')"
-                            :message="$i18n.getHelperMessage('fields', 'unique')"/>
+                            :title="$i18n.getHelperTitle('metadata', 'unique')"
+                            :message="$i18n.getHelperMessage('metadata', 'unique')"/>
                 </b-checkbox>
             </b-field>
         </b-field>
 
         <component
-                :errors="formErrors['field_type_options']"
-                v-if="(editForm.field_type_object && editForm.field_type_object.form_component) || editForm.edit_form == ''"
-                :is="editForm.field_type_object.form_component"
-                :field="editForm"
-                v-model="editForm.field_type_options"/>
+                :errors="formErrors['metadatum_type_options']"
+                v-if="(editForm.metadatum_type_object && editForm.metadatum_type_object.form_component) || editForm.edit_form == ''"
+                :is="editForm.metadatum_type_object.form_component"
+                :metadatum="editForm"
+                v-model="editForm.metadatum_type_options"/>
         <div
                 v-html="editForm.edit_form"
                 v-else/>
@@ -216,7 +216,7 @@
     import {mapActions} from 'vuex';
 
     export default {
-        name: 'FieldEditionForm',
+        name: 'MetadatumEditionForm',
         data() {
             return {
                 editForm: {},
@@ -228,42 +228,42 @@
         },
         props: {
             index: '',
-            editedField: Object,
-            originalField: Object,
+            editedMetadatum: Object,
+            originalMetadatum: Object,
             isRepositoryLevel: false,
             collectionId: ''
         },
         created() {
 
-            this.editForm = this.editedField;
+            this.editForm = this.editedMetadatum;
             this.formErrors = this.editForm.formErrors != undefined ? this.editForm.formErrors : {};
             this.formErrorMessage = this.editForm.formErrors != undefined ? this.editForm.formErrorMessage : '';
 
-            this.oldForm = JSON.parse(JSON.stringify(this.originalField));
+            this.oldForm = JSON.parse(JSON.stringify(this.originalMetadatum));
 
         },
         beforeDestroy() {
             if (this.closedByForm) {
-                this.editedField.saved = true;
+                this.editedMetadatum.saved = true;
             } else {
                 this.oldForm.saved = this.editForm.saved;
                 if (JSON.stringify(this.editForm) != JSON.stringify(this.oldForm))
-                    this.editedField.saved = false;
+                    this.editedMetadatum.saved = false;
                 else
-                    this.editedField.saved = true;
+                    this.editedMetadatum.saved = true;
             }
         },
         methods: {
-            ...mapActions('fields', [
-                'updateField'
+            ...mapActions('metadata', [
+                'updateMetadatum'
             ]),
-            saveEdition(field) {
+            saveEdition(metadatum) {
 
-                if ((field.field_type_object && field.field_type_object.form_component) || field.edit_form == '') {
+                if ((metadatum.metadatum_type_object && metadatum.metadatum_type_object.form_component) || metadatum.edit_form == '') {
 
-                    this.updateField({
+                    this.updateMetadatum({
                         collectionId: this.collectionId,
-                        fieldId: field.id,
+                        metadatumId: metadatum.id,
                         isRepositoryLevel: this.isRepositoryLevel,
                         index: this.index,
                         options: this.editForm
@@ -287,16 +287,16 @@
                             this.editForm.formErrorMessage = this.formErrorMessage;
                         });
                 } else {
-                    let formElement = document.getElementById('fieldEditForm');
+                    let formElement = document.getElementById('metadatumEditForm');
                     let formData = new FormData(formElement);
                     let formObj = {};
 
                     for (let [key, value] of formData.entries())
                         formObj[key] = value;
 
-                    this.updateField({
+                    this.updateMetadatum({
                         collectionId: this.collectionId,
-                        fieldId: field.id,
+                        metadatumId: metadatum.id,
                         isRepositoryLevel: this.isRepositoryLevel,
                         index: this.index,
                         options: formObj
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 438e4fb36..b6fe3ff21 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -150,8 +150,8 @@
                         })
                         .catch((errors) => {
                             for (let error of errors.errors) {
-                                for (let field of Object.keys(error)) {
-                                    this.$set(this.formErrors, field, (this.formErrors[field] !== undefined ? this.formErrors[field] : '') + error[field] + '\n');
+                                for (let metadatum of Object.keys(error)) {
+                                    this.$set(this.formErrors, metadatum, (this.formErrors[metadatum] !== undefined ? this.formErrors[metadatum] : '') + error[metadatum] + '\n');
                                 }
                             }
                             this.$emit('onErrorFound');
@@ -173,8 +173,8 @@
                         })
                         .catch((errors) => {
                             for (let error of errors.errors) {
-                                for (let field of Object.keys(error)) {
-                                    this.$set(this.formErrors, field, (this.formErrors[field] !== undefined ? this.formErrors[field] : '') + error[field] + '\n');
+                                for (let metadatum of Object.keys(error)) {
+                                    this.$set(this.formErrors, metadatum, (this.formErrors[metadatum] !== undefined ? this.formErrors[metadatum] : '') + error[metadatum] + '\n');
                                 }
                             }
                             this.$emit('onErrorFound');
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index 779899a76..42bf31630 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <b-loading :active.sync="isLoadingFieldTypes"/>
+        <b-loading :active.sync="isLoadingMetadatumTypes"/>
         <tainacan-title v-if="!isRepositoryLevel"/>
         <p v-if="isRepositoryLevel">{{ $i18n.get('info_repository_filters_inheritance') }}</p>
         <br>
@@ -35,7 +35,7 @@
                     <div  
                             class="active-filter-item" 
                             :class="{
-                                'not-sortable-item': filter.id == undefined || openedFilterId != '' || choosenField.name == filter.name, 
+                                'not-sortable-item': filter.id == undefined || openedFilterId != '' || choosenMetadatum.name == filter.name,
                                 'not-focusable-item': openedFilterId == filter.id, 
                                 'disabled-filter': filter.enabled == false
                             }" 
@@ -84,7 +84,7 @@
                                 </a>
                             </span>
                         </div>
-                        <div v-if="choosenField.id == filter.id && openedFilterId == ''">
+                        <div v-if="choosenMetadatum.id == filter.id && openedFilterId == ''">
                             <form class="tainacan-form">
                                 <b-field :label="$i18n.get('label_filter_type')">
                                     <b-select
@@ -128,25 +128,25 @@
                     </div>
                 </draggable>
             </div>
-            <div class="column available-fields-area">
+            <div class="column available-metadata-area">
                 <div class="field" >
-                    <h3 class="label"> {{ $i18n.get('label_available_fields') }}</h3>
+                    <h3 class="label"> {{ $i18n.get('label_available_metadata') }}</h3>
                     <draggable
-                            v-if="availableFieldList.length > 0" 
-                            v-model="availableFieldList" 
+                            v-if="availableMetadatumList.length > 0"
+                            v-model="availableMetadatumList"
                             :options="{ 
                                 sort: false, 
                                 group: { name:'filters', pull: true, put: false, revertClone: true },
                                 dragClass: 'sortable-drag'
                             }">
                         <div 
-                                class="available-field-item"
-                                v-if="field.enabled"
-                                v-for="(field, index) in availableFieldList" 
+                                class="available-metadatum-item"
+                                v-if="metadatum.enabled"
+                                v-for="(metadatum, index) in availableMetadatumList"
                                 :key="index"
-                                @click.prevent="addFieldViaButton(field, index)">  
+                                @click.prevent="addMetadatumViaButton(metadatum, index)">
                             <grip-icon/> 
-                              <span class="field-name">{{ field.name }}</span>
+                              <span class="metadatum-name">{{ metadatum.name }}</span>
                         </div>
                     </draggable>   
                 
@@ -159,13 +159,13 @@
                                         icon="format-list-checks"
                                         size="is-large"/>
                             </p>
-                            <p>{{ $i18n.get('info_there_is_no_field' ) }}</p>  
+                            <p>{{ $i18n.get('info_there_is_no_metadatum' ) }}</p>
                             <router-link
-                                    id="button-create-field"
-                                    :to="isRepositoryLevel ? $routerHelper.getNewFieldPath() : $routerHelper.getNewCollectionFieldPath(collectionId)"
+                                    id="button-create-metadatum"
+                                    :to="isRepositoryLevel ? $routerHelper.getNewMetadatumPath() : $routerHelper.getNewCollectionMetadatumPath(collectionId)"
                                     tag="button" 
                                     class="button is-secondary is-centered">
-                                {{ $i18n.getFrom('fields', 'new_item') }}</router-link>
+                                {{ $i18n.getFrom('metadata', 'new_item') }}</router-link>
                         </div>
                     </section>
                 </div>
@@ -187,7 +187,7 @@ export default {
             collectionId: '',
             isRepositoryLevel: false,
             isDraggingFromAvailable: false,
-            isLoadingFieldTypes: true,
+            isLoadingMetadatumTypes: true,
             isLoadingFilters: false,
             isLoadingFilterTypes: false,
             isLoadingFilter: false,
@@ -196,9 +196,9 @@ export default {
             editForms: {},
             allowedFilterTypes: [],
             selectedFilterType: {},
-            choosenField: {},
+            choosenMetadatum: {},
             newIndex: 0,
-            availableFieldList: [],
+            availableMetadatumList: [],
             filterTypes: []        
         }
     },
@@ -255,11 +255,11 @@ export default {
             'getFilters',
             'getFilterTypes'
         ]),
-        ...mapActions('fields', [
-            'fetchFields',
+        ...mapActions('metadata', [
+            'fetchMetadata',
         ]),
-        ...mapGetters('fields', [
-            'getFields',
+        ...mapGetters('metadata', [
+            'getMetadata',
         ]),
         handleChange($event) {     
             if ($event.added) {
@@ -278,20 +278,20 @@ export default {
             }
             this.updateCollectionFiltersOrder({ collectionId: this.collectionId, filtersOrder: filtersOrder });
         },
-        updateListOfFields() {
+        updateListOfMetadata() {
 
-            let availableFields = JSON.parse(JSON.stringify(this.getFields())) ;
+            let availableMetadata = JSON.parse(JSON.stringify(this.getMetadata())) ;
 
             for (let activeFilter of this.activeFilterList) {
-                for (let i = availableFields.length - 1; i >= 0 ; i--) {
-                    if (activeFilter.field != undefined) {
-                        if (activeFilter.field.field_id == availableFields[i].id) 
-                            availableFields.splice(i, 1);
+                for (let i = availableMetadata.length - 1; i >= 0 ; i--) {
+                    if (activeFilter.metadatum != undefined) {
+                        if (activeFilter.metadatum.metadatum_id == availableMetadata[i].id)
+                            availableMetadata.splice(i, 1);
                     }
                 }
             }
 
-            this.availableFieldList = availableFields;
+            this.availableMetadatumList = availableMetadata;
         },
         onChangeEnable($event, index) {
             this.activeFilterList[index].enabled = $event;
@@ -301,17 +301,17 @@ export default {
             }
             this.updateCollectionFiltersOrder({ collectionId: this.collectionId, filtersOrder: filtersOrder });
         },
-        addFieldViaButton(fieldType, fieldIndex) {
-            this.availableFieldList.splice(fieldIndex, 1);
+        addMetadatumViaButton(metadatumType, metadatumIndex) {
+            this.availableMetadatumList.splice(metadatumIndex, 1);
             let lastIndex = this.activeFilterList.length;
 
             // Updates store with temporary Filter
-            this.addTemporaryFilter(fieldType);
+            this.addTemporaryFilter(metadatumType);
 
-            this.addNewFilter(fieldType, lastIndex);
+            this.addNewFilter(metadatumType, lastIndex);
         },
-        addNewFilter(choosenField, newIndex) {
-            this.choosenField = choosenField;
+        addNewFilter(choosenMetadatum, newIndex) {
+            this.choosenMetadatum = choosenMetadatum;
             this.newIndex = newIndex;
             this.openedFilterId = '';
             this.allowedFilterTypes = [];
@@ -319,7 +319,7 @@ export default {
 
             for (let filter of this.filterTypes) {
                 for (let supportedType of filter['supported_types']) {
-                    if (choosenField.field_type_object.primitive_type == supportedType)
+                    if (choosenMetadatum.metadatum_type_object.primitive_type == supportedType)
                         this.allowedFilterTypes.push(filter);
                 }
             }
@@ -328,8 +328,8 @@ export default {
             
             this.sendFilter({
                 collectionId: this.collectionId, 
-                fieldId: this.choosenField.id, 
-                name: this.choosenField.name, 
+                metadatumId: this.choosenMetadatum.id,
+                name: this.choosenMetadatum.name,
                 filterType: this.selectedFilterType.name, 
                 status: 'auto-draft', 
                 isRepositoryLevel: this.isRepositoryLevel,
@@ -341,7 +341,7 @@ export default {
                     this.updateFiltersOrder();
 
                 this.newIndex = 0;
-                this.choosenField = {};
+                this.choosenMetadatum = {};
                 this.selectedFilterType = {}
                 this.allowedFilterTypes = [];
 
@@ -350,7 +350,7 @@ export default {
             .catch((error) => {
                 this.$console.error(error);
                 this.newIndex = 0;
-                this.choosenField = {};
+                this.choosenMetadatum = {};
                 this.selectedFilterType = {}
                 this.allowedFilterTypes = [];
             });
@@ -359,8 +359,8 @@ export default {
 
             this.deleteFilter(removedFilter.id)
             .then(() => {
-                // Reload Available Field Types List
-                this.updateListOfFields();
+                // Reload Available Metadatum Types List
+                this.updateListOfMetadata();
    
             })
             .catch((error) => { this.$console.log(error)});
@@ -372,8 +372,8 @@ export default {
             this.createChoosenFilter();
         },
         cancelFilterTypeSelection() {
-           this.availableFieldList.push(this.choosenField);
-           this.choosenField = {};
+           this.availableMetadatumList.push(this.choosenMetadatum);
+           this.choosenMetadatum = {};
            this.allowedFilterTypes = [];
            this.selectedFilterType = {};
            this.deleteTemporaryFilter(this.newIndex);
@@ -387,9 +387,9 @@ export default {
             // Opening collapse
             } else {
                 
-                if (this.openedFilterId == '' && this.choosenField.id != undefined) {
-                    this.availableFieldList.push(this.choosenField);
-                    this.choosenField = {};
+                if (this.openedFilterId == '' && this.choosenMetadatum.id != undefined) {
+                    this.availableMetadatumList.push(this.choosenMetadatum);
+                    this.choosenMetadatum = {};
                     this.allowedFilterTypes = [];
                     this.selectedFilterType = {};
                     this.deleteTemporaryFilter(this.newIndex);
@@ -429,7 +429,7 @@ export default {
         else
             this.collectionId = this.$route.params.collectionId;
 
-        this.isLoadingFieldTypes = true;
+        this.isLoadingMetadatumTypes = true;
         this.isLoadingFilters = true;
         this.isLoadingFilterTypes = true;
 
@@ -445,14 +445,14 @@ export default {
         this.fetchFilters({collectionId: this.collectionId, isRepositoryLevel: this.isRepositoryLevel, isContextEdit: true, includeDisabled: 'yes' })
             .then(() => {
                 this.isLoadingFilters = false;
-                // Needs to be done after activeFilterList exists to compare and remove chosen fields.
-                this.fetchFields({collectionId: this.collectionId, isRepositoryLevel: this.isRepositoryLevel, isContextEdit: true })
+                // Needs to be done after activeFilterList exists to compare and remove chosen metadata.
+                this.fetchMetadata({collectionId: this.collectionId, isRepositoryLevel: this.isRepositoryLevel, isContextEdit: true })
                     .then(() => {
-                        this.isLoadingFieldTypes = false;
-                        this.updateListOfFields();
+                        this.isLoadingMetadatumTypes = false;
+                        this.updateListOfMetadata();
                     })
                     .catch(() => {
-                        this.isLoadingFieldTypes = false;
+                        this.isLoadingMetadatumTypes = false;
                     });
             })
             .catch(() => {
@@ -589,14 +589,14 @@ export default {
             &.not-focusable-item, &.not-focusable-item:hover {
                 cursor: default;
                
-                .field-name {
+                .metadatum-name {
                     color: $secondary;
                 }
                 .handle .label-details, .handle .icon {
                     color: $gray !important;
                 }
             }
-            &.disabled-field {
+            &.disabled-metadatum {
                 color: $gray;
             }    
         }
@@ -645,7 +645,7 @@ export default {
         }
     }
 
-    .available-fields-area {
+    .available-metadata-area {
         padding: 10px 0px 10px 10px;
         margin: 0;
         max-width: 280px;
@@ -657,8 +657,8 @@ export default {
             h3 {
                 margin: 1em 0em 1em 0em !important;
             }
-            .available-field-item::before, 
-            .available-field-item::after {
+            .available-metadatum-item::before,
+            .available-metadatum-item::after {
                 display: none !important;
             }
         }
@@ -669,7 +669,7 @@ export default {
             font-weight: 500;
         }
 
-        .available-field-item {
+        .available-metadatum-item {
             padding: 0.7em;
             margin: 4px;
             background-color: white;
@@ -692,7 +692,7 @@ export default {
                 position: relative;
                 bottom: 3px;
             }
-            .field-name {
+            .metadatum-name {
                 text-overflow: ellipsis;
                 overflow-x: hidden;
                 white-space: nowrap;
@@ -731,7 +731,7 @@ export default {
         .sortable-drag {
             opacity: 1 !important;
         }
-        .available-field-item:hover {
+        .available-metadatum-item:hover {
             background-color: $secondary;
             border-color: $secondary;
             color: white;
diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue
index a55f333bd..0532b5849 100644
--- a/src/admin/components/lists/items-list.vue
+++ b/src/admin/components/lists/items-list.vue
@@ -57,9 +57,9 @@
 
                     <!-- Title -->
                     <p 
-                            v-for="(column, index) in tableFields"
+                            v-for="(column, index) in tableMetadata"
                             :key="index"
-                            v-if="column.display && column.field_type_object != undefined && (column.field_type_object.related_mapped_prop == 'title')"
+                            v-if="column.display && column.metadatum_type_object != undefined && (column.metadatum_type_object.related_mapped_prop == 'title')"
                             class="metadata-title"
                             @click="goToItemPage(item)"
                             v-html="item.metadata != undefined ? renderMetadata(item.metadata, column) : ''"/>                             
@@ -118,9 +118,9 @@
                     
                     <!-- Title -->
                     <p 
-                            v-for="(column, index) in tableFields"
+                            v-for="(column, index) in tableMetadata"
                             :key="index"
-                            v-if="column.display && column.field_type_object != undefined && (column.field_type_object.related_mapped_prop == 'title')"
+                            v-if="column.display && column.metadatum_type_object != undefined && (column.metadatum_type_object.related_mapped_prop == 'title')"
                             class="metadata-title"
                             @click="goToItemPage(item)"
                             v-html="item.metadata != undefined ? renderMetadata(item.metadata, column) : ''" />                             
@@ -160,9 +160,9 @@
 
                         <div class="list-metadata media-body">
                             <span 
-                                    v-for="(column, index) in tableFields"
+                                    v-for="(column, index) in tableMetadata"
                                     :key="index"
-                                    v-if="column.display && column.slug != 'thumbnail' && column.field_type_object != undefined && (column.field_type_object.related_mapped_prop != 'title')">
+                                    v-if="column.display && column.slug != 'thumbnail' && column.metadatum_type_object != undefined && (column.metadatum_type_object.related_mapped_prop != 'title')">
                                 <h3 class="metadata-label">{{ column.name }}</h3>
                                 <p 
                                         v-html="item.metadata != undefined ? renderMetadata(item.metadata, column) : ''"
@@ -185,17 +185,17 @@
                             &nbsp;
                             <!-- nothing to show on header for checkboxes -->
                         </th>
-                        <!-- Displayed Fields -->
+                        <!-- Displayed Metadata -->
                         <th 
-                                v-for="(column, index) in tableFields"
+                                v-for="(column, index) in tableMetadata"
                                 :key="index"
                                 v-if="column.display"
                                 class="column-default-width"
                                 :class="{
-                                        'thumbnail-cell': column.field == 'row_thumbnail', 
-                                        'column-small-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Date' || column.field_type_object.className == 'Tainacan\\Field_Types\\Numeric') : false,
-                                        'column-medium-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Selectbox' || column.field_type_object.className == 'Tainacan\\Field_Types\\Category' || column.field_type_object.className == 'Tainacan\\Field_Types\\Compound') : false,
-                                        'column-large-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Textarea') : false,
+                                        'thumbnail-cell': column.metadatum == 'row_thumbnail',
+                                        'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false,
+                                        'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false,
+                                        'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false,
                                 }"
                                 :custom-key="column.slug">
                             <div class="th-wrap">{{ column.name }}</div>
@@ -223,24 +223,24 @@
                         <!-- Item Displayed Metadata -->
                         <td 
                                 :key="index"    
-                                v-for="(column, index) in tableFields"
+                                v-for="(column, index) in tableMetadata"
                                 v-if="column.display"
                                 :label="column.name" 
                                 class="column-default-width"
                                 :class="{
-                                        'thumbnail-cell': column.field == 'row_thumbnail',
-                                        'column-main-content' : column.field_type_object != undefined ? (column.field_type_object.related_mapped_prop == 'title') : false,
-                                        'column-needed-width column-align-right' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Numeric') : false,
-                                        'column-small-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Date' || column.field_type_object.className == 'Tainacan\\Field_Types\\Numeric') : false,
-                                        'column-medium-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Selectbox' || column.field_type_object.className == 'Tainacan\\Field_Types\\Category' || column.field_type_object.className == 'Tainacan\\Field_Types\\Compound') : false,
-                                        'column-large-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Textarea') : false,
+                                        'thumbnail-cell': column.metadatum == 'row_thumbnail',
+                                        'column-main-content' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.related_mapped_prop == 'title') : false,
+                                        'column-needed-width column-align-right' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false,
+                                        'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false,
+                                        'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false,
+                                        'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false,
                                 }"
                                 @click="goToItemPage(item)">
 
                             <!-- <data-and-tooltip
-                                    v-if="column.field !== 'row_thumbnail' &&
-                                            column.field !== 'row_actions' &&
-                                            column.field !== 'row_creation'"
+                                    v-if="column.metadatum !== 'row_thumbnail' &&
+                                            column.metadatum !== 'row_actions' &&
+                                            column.metadatum !== 'row_creation'"
                                     :data="renderMetadata(item.metadata, column)"/> -->
                             <p
                                     v-tooltip="{
@@ -250,13 +250,13 @@
                                         placement: 'auto-start'
                                     }"
                                     v-if="item.metadata != undefined &&
-                                          column.field !== 'row_thumbnail' &&
-                                          column.field !== 'row_actions' &&
-                                          column.field !== 'row_creation' &&
-                                          column.field !== 'row_author'"
+                                          column.metadatum !== 'row_thumbnail' &&
+                                          column.metadatum !== 'row_actions' &&
+                                          column.metadatum !== 'row_creation' &&
+                                          column.metadatum !== 'row_author'"
                                     v-html="renderMetadata(item.metadata, column)"/>
 
-                            <span v-if="column.field == 'row_thumbnail'">
+                            <span v-if="column.metadatum == 'row_thumbnail'">
                                 <img 
                                         class="table-thumb" 
                                         :src="item['thumbnail'].thumb ? item['thumbnail'].thumb : thumbPlaceholderPath">
@@ -268,7 +268,7 @@
                                         autoHide: false,
                                         placement: 'auto-start'
                                     }"
-                                    v-if="column.field == 'row_author' || column.field == 'row_creation'">
+                                    v-if="column.metadatum == 'row_author' || column.metadatum == 'row_creation'">
                                     {{ item[column.slug] }}
                             </p>
 
@@ -321,7 +321,7 @@ export default {
     },
     props: {
         collectionId: Number,
-        tableFields: Array,
+        tableMetadata: Array,
         items: Array,
         isLoading: false,
         isOnTrash: false,
diff --git a/src/admin/components/lists/fields-list.vue b/src/admin/components/lists/metadata-list.vue
similarity index 68%
rename from src/admin/components/lists/fields-list.vue
rename to src/admin/components/lists/metadata-list.vue
index ee4914555..1a9fce88f 100644
--- a/src/admin/components/lists/fields-list.vue
+++ b/src/admin/components/lists/metadata-list.vue
@@ -1,15 +1,15 @@
 <template>
     <div>
-        <b-loading :active.sync="isLoadingFieldTypes"/>
+        <b-loading :active.sync="isLoadingMetadatumTypes"/>
         <tainacan-title v-if="!isRepositoryLevel"/>
         <p v-if="isRepositoryLevel">{{ $i18n.get('info_repository_metadata_inheritance') }}</p>
         <br>
         <b-tabs v-model="activeTab">    
-            <b-tab-item :label="$i18n.get('fields')">
+            <b-tab-item :label="$i18n.get('metadata')">
                 <div class="columns">
                     <div class="column"> 
                         <section 
-                                v-if="activeFieldList.length <= 0 && !isLoadingFields"
+                                v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
                                 class="field is-grouped-centered section">
                             <div class="content has-text-gray has-text-centered">
                                 <p>
@@ -17,120 +17,120 @@
                                             icon="format-list-bulleted-type"
                                             size="is-large"/>
                                 </p>
-                                <p>{{ $i18n.get('info_there_is_no_field' ) }}</p>  
+                                <p>{{ $i18n.get('info_there_is_no_metadatum' ) }}</p>
                                 <p>{{ $i18n.get('info_create_metadata' ) }}</p>
                             </div>
                         </section>             
                         <draggable 
-                                v-model="activeFieldList"
-                                class="active-fields-area"
+                                v-model="activeMetadatumList"
+                                class="active-metadata-area"
                                 @change="handleChange"
-                                :class="{'fields-area-receive': isDraggingFromAvailable}" 
+                                :class="{'metadata-area-receive': isDraggingFromAvailable}"
                                 :options="{ 
-                                        group: { name:'fields', pull: false, put: true }, 
-                                        sort: openedFieldId == '' || openedFieldId == undefined, 
-                                        //disabled: openedFieldId != '' && openedFieldId != undefined,
+                                        group: { name:'metadata', pull: false, put: true },
+                                        sort: openedMetadatumId == '' || openedMetadatumId == undefined,
+                                        //disabled: openedMetadatumId != '' && openedMetadatumId != undefined,
                                         handle: '.handle', 
                                         ghostClass: 'sortable-ghost',
                                         chosenClass: 'sortable-chosen',
                                         filter: 'not-sortable-item', 
                                         animation: '250'}">
                             <div  
-                                    class="active-field-item"
+                                    class="active-metadatum-item"
                                     :class="{
-                                        'not-sortable-item': field.id == undefined || openedFieldId != '' , 
-                                        'not-focusable-item': openedFieldId == field.id, 
-                                        'disabled-field': field.enabled == false
+                                        'not-sortable-item': metadatum.id == undefined || openedMetadatumId != '' ,
+                                        'not-focusable-item': openedMetadatumId == metadatum.id,
+                                        'disabled-metadatum': metadatum.enabled == false
                                     }" 
-                                    v-for="(field, index) in activeFieldList" 
+                                    v-for="(metadatum, index) in activeMetadatumList"
                                     :key="index">
                                 <div class="handle">
                                     <grip-icon/>
                                     <span 
-                                            class="field-name" 
-                                            :class="{'is-danger': formWithErrors == field.id }">
-                                            {{ field.name }}
+                                            class="metadatum-name"
+                                            :class="{'is-danger': formWithErrors == metadatum.id }">
+                                            {{ metadatum.name }}
                                     </span>
                                     <span   
-                                            v-if="field.id != undefined"
+                                            v-if="metadatum.id != undefined"
                                             class="label-details">  
-                                        ({{ $i18n.get(field.field_type_object.component) }}) <em>{{ (field.collection_id != collectionId) ? $i18n.get('label_inherited') : '' }}</em>   
+                                        ({{ $i18n.get(metadatum.metadatum_type_object.component) }}) <em>{{ (metadatum.collection_id != collectionId) ? $i18n.get('label_inherited') : '' }}</em>
                                             <span 
                                                 class="not-saved" 
-                                                v-if="(editForms[field.id] != undefined && editForms[field.id].saved != true) || field.status == 'auto-draft'"> 
+                                                v-if="(editForms[metadatum.id] != undefined && editForms[metadatum.id].saved != true) || metadatum.status == 'auto-draft'">
                                             {{ $i18n.get('info_not_saved') }}
                                             </span>
                                     </span>
                                     <span 
                                             class="loading-spinner" 
-                                            v-if="field.id == undefined"/>
+                                            v-if="metadatum.id == undefined"/>
                                     <span 
                                             class="controls" 
-                                            v-if="field.id !== undefined">
+                                            v-if="metadatum.id !== undefined">
                                         <b-switch 
                                                 size="is-small" 
-                                                v-model="field.enabled" 
+                                                v-model="metadatum.enabled"
                                                 @input="onChangeEnable($event, index)"/>
                                         <a 
                                                 :style="{ visibility: 
-                                                        field.collection_id != collectionId 
+                                                        metadatum.collection_id != collectionId
                                                         ? 'hidden' : 'visible'
                                                     }" 
-                                                @click.prevent="editField(field)">
+                                                @click.prevent="editMetadatum(metadatum)">
                                             <b-icon 
                                                     type="is-gray" 
                                                     icon="pencil"/>
                                         </a>
                                         <a 
                                                 :style="{ visibility: 
-                                                        field.collection_id != collectionId || 
-                                                        field.field_type == 'Tainacan\\Field_Types\\Core_Title' || 
-                                                        field.field_type == 'Tainacan\\Field_Types\\Core_Description' 
+                                                        metadatum.collection_id != collectionId ||
+                                                        metadatum.metadatum_type == 'Tainacan\\Metadatum_Types\\Core_Title' ||
+                                                        metadatum.metadatum_type == 'Tainacan\\Metadatum_Types\\Core_Description'
                                                         ? 'hidden' : 'visible'
                                                     }" 
-                                                @click.prevent="removeField(field)">
+                                                @click.prevent="removeMetadatum(metadatum)">
                                             <b-icon 
                                                     type="is-gray" 
                                                     icon="delete"/>
                                         </a>
                                     </span>
                                 </div>
-                                <div v-if="openedFieldId == field.id">
-                                    <field-edition-form   
+                                <div v-if="openedMetadatumId == metadatum.id">
+                                    <metadatum-edition-form
                                             :collection-id="collectionId"
                                             :is-repository-level="isRepositoryLevel"
                                             @onEditionFinished="onEditionFinished()"
                                             @onEditionCanceled="onEditionCanceled()"
-                                            @onErrorFound="formWithErrors = field.id"
+                                            @onErrorFound="formWithErrors = metadatum.id"
                                             :index="index"
-                                            :original-field="field"
-                                            :edited-field="editForms[field.id]"/>
+                                            :original-metadatum="metadatum"
+                                            :edited-metadatum="editForms[metadatum.id]"/>
                                 </div>
                             </div>
                         </draggable> 
                     </div>
                 
-                    <div class="column available-fields-area" >
+                    <div class="column available-metadata-area" >
                         <div class="field">
-                            <h3 class="label">{{ $i18n.get('label_available_field_types') }}</h3>
+                            <h3 class="label">{{ $i18n.get('label_available_metadatum_types') }}</h3>
                             <draggable 
-                                    v-model="availableFieldList" 
+                                    v-model="availableMetadatumList"
                                     :options="{ 
                                         sort: false, 
-                                        group: { name:'fields', pull: 'clone', put: false, revertClone: true },
+                                        group: { name:'metadata', pull: 'clone', put: false, revertClone: true },
                                         dragClass: 'sortable-drag'
                                     }">
                                 <div 
-                                        @click.prevent="addFieldViaButton(field)" 
-                                        class="available-field-item"
-                                        :class="{ 'hightlighted-field' : hightlightedField == field.name }" 
-                                        v-for="(field, index) in availableFieldList" 
+                                        @click.prevent="addMetadatumViaButton(metadatum)"
+                                        class="available-metadatum-item"
+                                        :class="{ 'hightlighted-metadatum' : hightlightedMetadatum == metadatum.name }"
+                                        v-for="(metadatum, index) in availableMetadatumList"
                                         :key="index">
                                 <grip-icon/>  
-                                    <span class="field-name">{{ field.name }}</span> 
+                                    <span class="metadatum-name">{{ metadatum.name }}</span>
                                     <span 
                                             class="loading-spinner" 
-                                            v-if="hightlightedField == field.name"/>   
+                                            v-if="hightlightedMetadatum == metadatum.name"/>
                                 </div>
                             </draggable>
                         </div>
@@ -148,44 +148,44 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import GripIcon from '../other/grip-icon.vue';
-import FieldEditionForm from './../edition/field-edition-form.vue';
+import MetadatumEditionForm from './../edition/metadatum-edition-form.vue';
 import CustomDialog from '../other/custom-dialog.vue';
 
 export default {
-    name: 'FieldsList',
+    name: 'MetadataList',
     data(){           
         return {
             collectionId: '',
             isRepositoryLevel: false,
             isDraggingFromAvailable: false,
-            isLoadingFieldTypes: true,
-            isLoadingFields: false,
-            isLoadingField: false,
-            openedFieldId: '',
+            isLoadingMetadatumTypes: true,
+            isLoadingMetadata: false,
+            isLoadingMetadatum: false,
+            openedMetadatumId: '',
             formWithErrors: '',
-            hightlightedField: '',
+            hightlightedMetadatum: '',
             editForms: {}
         }
     },
     components: {
-        FieldEditionForm,
+        MetadatumEditionForm,
         GripIcon
     },
     computed: {
-        availableFieldList: {
+        availableMetadatumList: {
             get() {
-                return this.getFieldTypes();
+                return this.getMetadatumTypes();
             },
             set(value) {
-                return this.updateFieldTypes(value);
+                return this.updateMetadatumTypes(value);
             }
         },
-        activeFieldList: {
+        activeMetadatumList: {
             get() {
-                return this.getFields();
+                return this.getMetadata();
             },
             set(value) {
-                this.updateFields(value);
+                this.updateMetadata(value);
             }
         }
     },
@@ -195,14 +195,14 @@ export default {
             if (!this.editForms[editForm].saved) 
                 hasUnsavedForms = true;
         }
-        if ((this.openedFieldId != '' && this.openedFieldId != undefined) || hasUnsavedForms ) {
+        if ((this.openedMetadatumId != '' && this.openedMetadatumId != undefined) || hasUnsavedForms ) {
             this.$modal.open({
                 parent: this,
                 component: CustomDialog,
                 props: {
                     icon: 'alert',
                     title: this.$i18n.get('label_warning'),
-                    message: this.$i18n.get('info_warning_fields_not_saved'),
+                    message: this.$i18n.get('info_warning_metadata_not_saved'),
                     onConfirm: () => {
                         this.onEditionCanceled();
                         next();
@@ -214,133 +214,133 @@ export default {
         }  
     },
     methods: {
-        ...mapActions('fields', [
-            'fetchFieldTypes',
-            'updateFieldTypes',
-            'fetchFields',
-            'sendField',
-            'deleteField',
-            'updateFields',
-            'updateCollectionFieldsOrder'
+        ...mapActions('metadata', [
+            'fetchMetadatumTypes',
+            'updateMetadatumTypes',
+            'fetchMetadata',
+            'sendMetadatum',
+            'deleteMetadatum',
+            'updateMetadata',
+            'updateCollectionMetadataOrder'
         ]),
-        ...mapGetters('fields',[
-            'getFieldTypes',
-            'getFields'
+        ...mapGetters('metadata',[
+            'getMetadatumTypes',
+            'getMetadata'
         ]),
         handleChange(event) {     
             if (event.added) {
-                this.addNewField(event.added.element, event.added.newIndex);
+                this.addNewMetadatum(event.added.element, event.added.newIndex);
             } else if (event.removed) {
-                this.removeField(event.removed.element);
+                this.removeMetadatum(event.removed.element);
             } else if (event.moved) {
                 if (!this.isRepositoryLevel)
-                    this.updateFieldsOrder(); 
+                    this.updateMetadataOrder();
             }
         },
-        updateFieldsOrder() {
-            let fieldsOrder = [];
-            for (let field of this.activeFieldList) {
-                fieldsOrder.push({'id': field.id, 'enabled': field.enabled});
+        updateMetadataOrder() {
+            let metadataOrder = [];
+            for (let metadatum of this.activeMetadatumList) {
+                metadataOrder.push({'id': metadatum.id, 'enabled': metadatum.enabled});
             }
-            this.updateCollectionFieldsOrder({ collectionId: this.collectionId, fieldsOrder: fieldsOrder });
+            this.updateCollectionMetadataOrder({ collectionId: this.collectionId, metadataOrder: metadataOrder });
         },
         onChangeEnable($event, index) {
-            this.activeFieldList[index].enabled = $event;
-            let fieldsOrder = [];
-            for (let field of this.activeFieldList) {
-                fieldsOrder.push({'id': field.id, 'enabled': field.enabled});
+            this.activeMetadatumList[index].enabled = $event;
+            let metadataOrder = [];
+            for (let metadatum of this.activeMetadatumList) {
+                metadataOrder.push({'id': metadatum.id, 'enabled': metadatum.enabled});
             }
-            this.updateCollectionFieldsOrder({ collectionId: this.collectionId, fieldsOrder: fieldsOrder });
+            this.updateCollectionMetadataOrder({ collectionId: this.collectionId, metadataOrder: metadataOrder });
         },
-        addFieldViaButton(fieldType) {
-            let lastIndex = this.activeFieldList.length;
-            this.addNewField(fieldType, lastIndex);
+        addMetadatumViaButton(metadatumType) {
+            let lastIndex = this.activeMetadatumList.length;
+            this.addNewMetadatum(metadatumType, lastIndex);
             
-            // Higlights the clicker field
-            this.hightlightedField = fieldType.name;
+            // Higlights the clicker metadatum
+            this.hightlightedMetadatum = metadatumType.name;
 
         },
-        addNewField(newField, newIndex) {
-            this.sendField({collectionId: this.collectionId, name: newField.name, fieldType: newField.className, status: 'auto-draft', isRepositoryLevel: this.isRepositoryLevel, newIndex: newIndex})
-            .then((field) => {
+        addNewMetadatum(newMetadatum, newIndex) {
+            this.sendMetadatum({collectionId: this.collectionId, name: newMetadatum.name, metadatumType: newMetadatum.className, status: 'auto-draft', isRepositoryLevel: this.isRepositoryLevel, newIndex: newIndex})
+            .then((metadatum) => {
 
                 if (!this.isRepositoryLevel)
-                    this.updateFieldsOrder();
+                    this.updateMetadataOrder();
 
-                this.editField(field);
-                this.hightlightedField = '';
+                this.editMetadatum(metadatum);
+                this.hightlightedMetadatum = '';
             })
             .catch((error) => {
                 this.$console.error(error);
             });
         },
-        removeField(removedField) {
-            this.deleteField({ collectionId: this.collectionId, fieldId: removedField.id, isRepositoryLevel: this.isRepositoryLevel})
+        removeMetadatum(removedMetadatum) {
+            this.deleteMetadatum({ collectionId: this.collectionId, metadatumId: removedMetadatum.id, isRepositoryLevel: this.isRepositoryLevel})
             .then(() => {
                 if (!this.isRepositoryLevel)
-                    this.updateFieldsOrder(); 
+                    this.updateMetadataOrder();
             })
             .catch(() => {
             });
         },
-        editField(field) {
+        editMetadatum(metadatum) {
             // Closing collapse
-            if (this.openedFieldId == field.id) {    
-                this.openedFieldId = '';
+            if (this.openedMetadatumId == metadatum.id) {
+                this.openedMetadatumId = '';
 
             // Opening collapse
             } else {
 
-                this.openedFieldId = field.id;
+                this.openedMetadatumId = metadatum.id;
                 // First time opening
-                if (this.editForms[this.openedFieldId] == undefined) {
-                    this.editForms[this.openedFieldId] = JSON.parse(JSON.stringify(field));
-                    this.editForms[this.openedFieldId].saved = true;  
+                if (this.editForms[this.openedMetadatumId] == undefined) {
+                    this.editForms[this.openedMetadatumId] = JSON.parse(JSON.stringify(metadatum));
+                    this.editForms[this.openedMetadatumId].saved = true;
 
-                    // Field inserted now
-                    if (this.editForms[this.openedFieldId].status == 'auto-draft') {
-                        this.editForms[this.openedFieldId].status = 'publish'; 
-                        this.editForms[this.openedFieldId].saved = false;
+                    // Metadatum inserted now
+                    if (this.editForms[this.openedMetadatumId].status == 'auto-draft') {
+                        this.editForms[this.openedMetadatumId].status = 'publish';
+                        this.editForms[this.openedMetadatumId].saved = false;
                     }
                 }     
             }
         },
         onEditionFinished() {
             this.formWithErrors = '';
-            delete this.editForms[this.openedFieldId];
-            this.openedFieldId = '';
+            delete this.editForms[this.openedMetadatumId];
+            this.openedMetadatumId = '';
         },
         onEditionCanceled() {
             this.formWithErrors = '';
-            delete this.editForms[this.openedFieldId];
-            this.openedFieldId = '';
+            delete this.editForms[this.openedMetadatumId];
+            this.openedMetadatumId = '';
         }
     },
     created() {
-        this.isLoadingFieldTypes = true;
-        this.isLoadingFields = true;
+        this.isLoadingMetadatumTypes = true;
+        this.isLoadingMetadata = true;
 
-        this.fetchFieldTypes()
+        this.fetchMetadatumTypes()
             .then(() => {
-                this.isLoadingFieldTypes = false;
+                this.isLoadingMetadatumTypes = false;
             })
             .catch(() => {
-                this.isLoadingFieldTypes = false;
+                this.isLoadingMetadatumTypes = false;
             });
 
-        this.isRepositoryLevel = this.$route.name == 'FieldsPage' ? true : false;
+        this.isRepositoryLevel = this.$route.name == 'MetadataPage' ? true : false;
         if (this.isRepositoryLevel)
             this.collectionId = 'default';
         else
             this.collectionId = this.$route.params.collectionId;
         
 
-        this.fetchFields({collectionId: this.collectionId, isRepositoryLevel: this.isRepositoryLevel, isContextEdit: true})
+        this.fetchMetadata({collectionId: this.collectionId, isRepositoryLevel: this.isRepositoryLevel, isContextEdit: true})
             .then(() => {
-                this.isLoadingFields = false;
+                this.isLoadingMetadata = false;
             })
             .catch(() => {
-                this.isLoadingFields = false;
+                this.isLoadingMetadata = false;
             });
     },
     mounted() {
@@ -378,7 +378,7 @@ export default {
         width: 1em;
     }
 
-    .active-fields-area {
+    .active-metadata-area {
         font-size: 14px;
         margin-right: 0.8em;
         margin-left: -0.8em;
@@ -394,7 +394,7 @@ export default {
             padding-right: 1em;
         }
 
-        &.fields-area-receive {
+        &.metadata-area-receive {
             border: 1px dashed gray;
         }
 
@@ -402,7 +402,7 @@ export default {
             display: initial;
         }
 
-        .active-field-item {
+        .active-metadatum-item {
             background-color: white;
             padding: 0.7em 0.9em;
             margin: 4px;
@@ -420,7 +420,7 @@ export default {
                 top: 2px;
                 position: relative;
             }
-            .field-name {
+            .metadatum-name {
                 text-overflow: ellipsis;
                 overflow-x: hidden;
                 white-space: nowrap;
@@ -467,18 +467,18 @@ export default {
             &.not-focusable-item, &.not-focusable-item:hover {
                 cursor: default;
                
-                .field-name {
+                .metadatum-name {
                     color: $secondary;
                 }
                 .handle .label-details, .handle .icon {
                     color: $gray !important;
                 }
             }
-            &.disabled-field {
+            &.disabled-metadatum {
                 color: $gray;
             }    
         }
-        .active-field-item:hover:not(.not-sortable-item) {
+        .active-metadatum-item:hover:not(.not-sortable-item) {
             background-color: $secondary;
             border-color: $secondary;
             color: white !important;
@@ -521,7 +521,7 @@ export default {
         }
     }
 
-    .available-fields-area {
+    .available-metadata-area {
         padding: 10px 0px 10px 10px;
         margin: 0;
         max-width: 280px;
@@ -533,8 +533,8 @@ export default {
             h3 {
                 margin: 1em 0em 1em 0em !important;
             }
-            .available-field-item::before, 
-            .available-field-item::after {
+            .available-metadatum-item::before,
+            .available-metadatum-item::after {
                 display: none !important;
             }
         }
@@ -545,7 +545,7 @@ export default {
             font-weight: 500;
         }
 
-        .available-field-item {
+        .available-metadatum-item {
             padding: 0.7em;
             margin: 4px;
             background-color: white;
@@ -568,7 +568,7 @@ export default {
                 position: relative;
                 bottom: 1px;
             }
-            .field-name {
+            .metadatum-name {
                 text-overflow: ellipsis;
                 overflow-x: hidden;
                 white-space: nowrap;
@@ -655,7 +655,7 @@ export default {
                 border-color: transparent white transparent transparent;  
             }
         }
-        .hightlighted-field {
+        .hightlighted-metadatum {
             background-color: white;
             position: relative;
             left: 0px;
@@ -676,7 +676,7 @@ export default {
                 animation-iteration-count: 2;
             }
         }
-        .available-field-item:hover {
+        .available-metadatum-item:hover {
             background-color: $secondary;
             border-color: $secondary;
             color: white;
diff --git a/src/admin/components/navigation/primary-menu.vue b/src/admin/components/navigation/primary-menu.vue
index fad8d3548..3a55412cc 100644
--- a/src/admin/components/navigation/primary-menu.vue
+++ b/src/admin/components/navigation/primary-menu.vue
@@ -34,12 +34,12 @@
                 <li>
                     <router-link
                             tag="a"
-                            to="/fields"
-                            :class="activeRoute == 'FieldsPage' ? 'is-active':''">
+                            to="/metadata"
+                            :class="activeRoute == 'MetadataPage' ? 'is-active':''">
                         <b-icon
                                 size="is-small"
                                 icon="format-list-bulleted-type"/>
-                        <span class="menu-text">{{ $i18n.getFrom('fields', 'name') }}</span>
+                        <span class="menu-text">{{ $i18n.getFrom('metadata', 'name') }}</span>
                     </router-link>
                 </li>
                 <li>
diff --git a/src/admin/components/navigation/tainacan-subheader.vue b/src/admin/components/navigation/tainacan-subheader.vue
index 8e25134ed..87aa91ad5 100644
--- a/src/admin/components/navigation/tainacan-subheader.vue
+++ b/src/admin/components/navigation/tainacan-subheader.vue
@@ -54,14 +54,14 @@
             <li class="level-item">
                 <router-link 
                         tag="a" 
-                        :to="{ path: $routerHelper.getCollectionFieldsPath(id) }" 
-                        :class="activeRoute == 'FieldsList' ? 'is-active':''" 
-                        :aria-label="$i18n.get('label_collection_fields')">
+                        :to="{ path: $routerHelper.getCollectionMetadataPath(id) }"
+                        :class="activeRoute == 'MetadataList' ? 'is-active':''"
+                        :aria-label="$i18n.get('label_collection_metadata')">
                     <b-icon 
                         size="is-small" 
                         icon="format-list-bulleted-type"/>
                     <br>
-                    <span class="menu-text">{{ $i18n.getFrom('fields', 'name') }}</span>
+                    <span class="menu-text">{{ $i18n.getFrom('metadata', 'name') }}</span>
                 </router-link>
             </li>
             <li class="level-item">
diff --git a/src/admin/components/other/event/diff-exhibition/event-split.vue b/src/admin/components/other/event/diff-exhibition/event-split.vue
index 8cf7ab37d..153bbb435 100644
--- a/src/admin/components/other/event/diff-exhibition/event-split.vue
+++ b/src/admin/components/other/event/diff-exhibition/event-split.vue
@@ -49,7 +49,7 @@
                                 </div>
 
                                 <div
-                                        v-else-if="key === 'fields_order' || key === 'filters_order'"
+                                        v-else-if="key === 'metadata_order' || key === 'filters_order'"
                                         class="is-capitalized">
                                     {{ `ID: ${o.id} Enabled: ${o.enabled ? o.enabled : 'false'}` }}
                                 </div>
@@ -132,7 +132,7 @@
                                 </div>
 
                                 <div
-                                        v-else-if="key === 'fields_order' || key === 'filters_order'"
+                                        v-else-if="key === 'metadata_order' || key === 'filters_order'"
                                         class="is-capitalized"
                                         :class="{ 'back-hlight': diff.diff_with_index.hasOwnProperty(i) }">
                                     {{ `ID: ${d.id} Enabled: ${d.enabled ? d.enabled : 'false'}` }}
diff --git a/src/admin/components/other/event/diff-exhibition/event-unified.vue b/src/admin/components/other/event/diff-exhibition/event-unified.vue
index ad3c6458c..34cf51060 100644
--- a/src/admin/components/other/event/diff-exhibition/event-unified.vue
+++ b/src/admin/components/other/event/diff-exhibition/event-unified.vue
@@ -51,7 +51,7 @@
                                 </div>
 
                                 <div
-                                        v-else-if="key === 'fields_order' || key === 'filters_order'"
+                                        v-else-if="key === 'metadata_order' || key === 'filters_order'"
                                         class="is-capitalized">
                                     {{ `ID: ${o.id} Enabled: ${o.enabled ? o.enabled : 'false'}` }}
                                 </div>
@@ -129,7 +129,7 @@
                                 </div>
 
                                 <div
-                                        v-else-if="key === 'fields_order' || key === 'filters_order'"
+                                        v-else-if="key === 'metadata_order' || key === 'filters_order'"
                                         class="is-capitalized"
                                         :class="{ 'back-hlight': diff.diff_with_index.hasOwnProperty(i) }">
                                     {{ `ID: ${d.id} Enabled: ${d.enabled ? d.enabled : 'false'}` }}
diff --git a/src/admin/components/other/event/unique-exhibition/event-nodiff.vue b/src/admin/components/other/event/unique-exhibition/event-nodiff.vue
index 9bf435297..bb605b6bc 100644
--- a/src/admin/components/other/event/unique-exhibition/event-nodiff.vue
+++ b/src/admin/components/other/event/unique-exhibition/event-nodiff.vue
@@ -47,7 +47,7 @@
                                 </div>
 
                                 <div
-                                        v-else-if="key === 'fields_order' || key === 'filters_order'"
+                                        v-else-if="key === 'metadata_order' || key === 'filters_order'"
                                         class="is-capitalized">
                                     {{ `ID: ${d.id} Enabled: ${d.enabled}` }}
                                 </div>
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index fcbbc0e7d..85cab50af 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -8,17 +8,17 @@ import Buefy from 'buefy';
 import VTooltip from 'v-tooltip'
 
 // Custom elements
-import Text from '../../classes/field-types/text/Text.vue';
-import Textarea from '../../classes/field-types/textarea/Textarea.vue';
-import Selectbox from '../../classes/field-types/selectbox/Selectbox.vue';
-import Numeric from '../../classes/field-types/numeric/Numeric.vue';
-import Date from '../../classes/field-types/date/Date.vue';
-import Relationship from '../../classes/field-types/relationship/Relationship.vue';
-import Category from '../../classes/field-types/category/Category.vue';
+import Text from '../../classes/metadatum-types/text/Text.vue';
+import Textarea from '../../classes/metadatum-types/textarea/Textarea.vue';
+import Selectbox from '../../classes/metadatum-types/selectbox/Selectbox.vue';
+import Numeric from '../../classes/metadatum-types/numeric/Numeric.vue';
+import Date from '../../classes/metadatum-types/date/Date.vue';
+import Relationship from '../../classes/metadatum-types/relationship/Relationship.vue';
+import Category from '../../classes/metadatum-types/category/Category.vue';
 
-import FormRelationship from '../../classes/field-types/relationship/FormRelationship.vue';
-import FormCategory from '../../classes/field-types/category/FormCategory.vue';
-import FormSelectbox from '../../classes/field-types/selectbox/FormSelectbox.vue';
+import FormRelationship from '../../classes/metadatum-types/relationship/FormRelationship.vue';
+import FormCategory from '../../classes/metadatum-types/category/FormCategory.vue';
+import FormSelectbox from '../../classes/metadatum-types/selectbox/FormSelectbox.vue';
 
 import FilterCustomInterval from '../../classes/filter-types/custom-interval/CustomInterval.vue';
 import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
@@ -30,7 +30,7 @@ import FilterCategoryCheckbox from '../../classes/filter-types/category/Checkbox
 import FilterCategoryTaginput from '../../classes/filter-types/category/Taginput.vue';
 import FilterCategorySelectbox from '../../classes/filter-types/category/Selectbox.vue';
 
-import TainacanFormItem from '../../classes/field-types/tainacan-form-item.vue';
+import TainacanFormItem from '../../classes/metadatum-types/tainacan-form-item.vue';
 import TainacanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
 
 // Remaining imports
@@ -54,7 +54,7 @@ Vue.use(UserCapabilitiesPlugin);
 Vue.use(ConsolePlugin, {visual: false});
 Vue.use(VueMask);
 
-/* Fields */
+/* Metadata */
 Vue.component('tainacan-text', Text);
 Vue.component('tainacan-textarea', Textarea);
 Vue.component('tainacan-selectbox', Selectbox);
diff --git a/src/admin/js/router.js b/src/admin/js/router.js
index 6df3cdb23..76c60f5a5 100644
--- a/src/admin/js/router.js
+++ b/src/admin/js/router.js
@@ -7,7 +7,7 @@ import CollectionsPage from '../pages/lists/collections-page.vue'
 import CollectionPage from '../pages/singles/collection-page.vue'
 import ItemsPage from '../pages/lists/items-page.vue'
 import ItemPage from '../pages/singles/item-page.vue'
-import FieldsPage from '../pages/lists/fields-page.vue'
+import MetadataPage from '../pages/lists/metadata-page.vue'
 import FiltersPage from '../pages/lists/filters-page.vue'
 import CategoriesPage from '../pages/lists/categories-page.vue'
 import CategoryPage from '../pages/singles/category-page.vue'
@@ -21,7 +21,7 @@ import CategoryEditionForm from '../components/edition/category-edition-form.vue
 
 // Listing components
 import FiltersList from '../components/lists/filters-list.vue'
-import FieldsList from '../components/lists/fields-list.vue'
+import MetadataList from '../components/lists/metadata-list.vue'
 
 Vue.use(VueRouter);
 
@@ -45,7 +45,7 @@ const routes = [
         { path: 'items/new', name: 'CollectionItemCreatePage', component: ItemEditionForm, meta: {title: i18nGet('title_create_item_collection'), icon: 'folder-multiple'} },
         { path: 'items/:itemId', name: 'ItemPage', component: ItemPage, meta: {title: i18nGet('title_item_page'), icon: 'folder-multiple'} },   
         { path: 'settings', component: CollectionEditionForm,  name: 'CollectionEditionForm', meta: {title: i18nGet('title_collection_settings'), icon: 'folder-multiple'} },
-        { path: 'fields', component: FieldsList, name: 'FieldsList', meta: {title: i18nGet('title_collection_fields_edition'), icon: 'folder-multiple'} }, 
+        { path: 'metadata', component: MetadataList, name: 'MetadataList', meta: {title: i18nGet('title_collection_metadata_edition'), icon: 'folder-multiple'} },
         { path: 'filters', component: FiltersList, name: 'FiltersList', meta: {title: i18nGet('title_collection_filters_edition'), icon: 'folder-multiple'} },
         { path: 'events', component: EventsPage, name: 'CollectionEventsPage', meta: {title: i18nGet('title_collection_events'), icon: 'flash'} }
       ]
@@ -56,7 +56,7 @@ const routes = [
 
     { path: '/filters', name: 'FiltersPage', component: FiltersPage, meta: {title: i18nGet('title_repository_filters_page'), icon: 'filter'} },
 
-    { path: '/fields', name: 'FieldsPage', component: FieldsPage, meta: {title: i18nGet('title_repository_fields_page'), icon: 'format-list-checks'} },
+    { path: '/metadata', name: 'MetadataPage', component: MetadataPage, meta: {title: i18nGet('title_repository_metadata_page'), icon: 'format-list-checks'} },
 
     { path: '/taxonomies', name: 'CategoriesPage', component: CategoriesPage, meta: {title: i18nGet('title_categories_page'), icon: 'shape'} },
     { path: '/taxonomies/new', name: 'CategoryCreationForm', component: CategoryEditionForm, meta: {title: i18nGet('title_create_category_page'), icon: 'shape'} },
diff --git a/src/admin/js/theme-main.js b/src/admin/js/theme-main.js
index ddd80bb14..f7e0b8224 100644
--- a/src/admin/js/theme-main.js
+++ b/src/admin/js/theme-main.js
@@ -4,17 +4,17 @@ import Buefy from 'buefy';
 import VTooltip from 'v-tooltip'
 
 // Custom elements
-import Text from '../../classes/field-types/text/Text.vue';
-import Textarea from '../../classes/field-types/textarea/Textarea.vue';
-import Selectbox from '../../classes/field-types/selectbox/Selectbox.vue';
-import Numeric from '../../classes/field-types/numeric/Numeric.vue';
-import Date from '../../classes/field-types/date/Date.vue';
-import Relationship from '../../classes/field-types/relationship/Relationship.vue';
-import Category from '../../classes/field-types/category/Category.vue';
+import Text from '../../classes/metadatum-types/text/Text.vue';
+import Textarea from '../../classes/metadatum-types/textarea/Textarea.vue';
+import Selectbox from '../../classes/metadatum-types/selectbox/Selectbox.vue';
+import Numeric from '../../classes/metadatum-types/numeric/Numeric.vue';
+import Date from '../../classes/metadatum-types/date/Date.vue';
+import Relationship from '../../classes/metadatum-types/relationship/Relationship.vue';
+import Category from '../../classes/metadatum-types/category/Category.vue';
 
-import FormRelationship from '../../classes/field-types/relationship/FormRelationship.vue';
-import FormCategory from '../../classes/field-types/category/FormCategory.vue';
-import FormSelectbox from '../../classes/field-types/selectbox/FormSelectbox.vue';
+import FormRelationship from '../../classes/metadatum-types/relationship/FormRelationship.vue';
+import FormCategory from '../../classes/metadatum-types/category/FormCategory.vue';
+import FormSelectbox from '../../classes/metadatum-types/selectbox/FormSelectbox.vue';
 
 import FilterCustomInterval from '../../classes/filter-types/custom-interval/CustomInterval.vue';
 import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
@@ -26,7 +26,7 @@ import FilterCategoryCheckbox from '../../classes/filter-types/category/Checkbox
 import FilterCategoryTaginput from '../../classes/filter-types/category/Taginput.vue';
 import FilterCategorySelectbox from '../../classes/filter-types/category/Selectbox.vue';
 
-import TaincanFormItem from '../../classes/field-types/tainacan-form-item.vue';
+import TaincanFormItem from '../../classes/metadatum-types/tainacan-form-item.vue';
 import TaincanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
 import ItemsPage from '../pages/lists/items-page.vue';
 import TableViewMode from '../../theme-helper/table-view-mode.vue';
@@ -47,7 +47,7 @@ Vue.use(UserPrefsPlugin);
 Vue.use(RouterHelperPlugin);
 Vue.use(ConsolePlugin, {visual: false});
 
-/* Fields */
+/* Metadata */
 Vue.component('tainacan-text', Text);
 Vue.component('tainacan-textarea', Textarea);
 Vue.component('tainacan-selectbox', Selectbox);
diff --git a/src/admin/js/utilities.js b/src/admin/js/utilities.js
index 40deae979..6131a8cd5 100644
--- a/src/admin/js/utilities.js
+++ b/src/admin/js/utilities.js
@@ -162,8 +162,8 @@ RouterHelperPlugin.install = function (Vue, options = {}) {
         getCollectionItemsPath(collectionId, query) {
             return '/collections/'+ collectionId + '/items/?' + qs.stringify(query);
         },
-        getCollectionFieldsPath(collectionId) {
-            return '/collections/'+ collectionId + '/fields/';
+        getCollectionMetadataPath(collectionId) {
+            return '/collections/'+ collectionId + '/metadata/';
         },
         getCollectionFiltersPath(collectionId) {
             return '/collections/'+ collectionId + '/filters/';
@@ -183,8 +183,8 @@ RouterHelperPlugin.install = function (Vue, options = {}) {
         getFiltersPath(query) {
             return '/filters/?' + qs.stringify(query);
         },
-        getFieldsPath(query) {
-            return '/fields/?' + qs.stringify(query);
+        getMetadataPath(query) {
+            return '/metadata/?' + qs.stringify(query);
         },
         getEventsPath(query) {
             return '/events/?' + qs.stringify(query);
@@ -218,11 +218,11 @@ RouterHelperPlugin.install = function (Vue, options = {}) {
         getNewItemPath(collectionId) {
             return '/collections/' + collectionId + '/items/new';
         },
-        getNewCollectionFieldPath(collectionId) {
-            return '/collections/' + collectionId + '/fields/';
+        getNewCollectionMetadatumPath(collectionId) {
+            return '/collections/' + collectionId + '/metadata/';
         },
-        getNewFieldPath() {
-            return '/fields';
+        getNewMetadatumPath() {
+            return '/metadata';
         },
         getNewCollectionFilterPath(collectionId) {
             return '/collections/' + collectionId + '/filters/';
diff --git a/src/admin/pages/lists/collections-page.vue b/src/admin/pages/lists/collections-page.vue
index 904e2e0f6..f586055ef 100644
--- a/src/admin/pages/lists/collections-page.vue
+++ b/src/admin/pages/lists/collections-page.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="primary-page page-container">
-        <b-loading :active.sync="isLoadingFieldMappers"/>
+        <b-loading :active.sync="isLoadingMetadatumMappers"/>
         <tainacan-title />
         <div
                 class="sub-header"
@@ -24,14 +24,14 @@
                         </router-link>
                     </b-dropdown-item>
                     <b-dropdown-item
-                            :key="field_mapper.slug"
-                            v-for="field_mapper in field_mappers"
-                            v-if="field_mapper.metadata != false">
+                            :key="metadatum_mapper.slug"
+                            v-for="metadatum_mapper in metadatum_mappers"
+                            v-if="metadatum_mapper.metadata != false">
                         <router-link
-                                :id="'a-create-collection-' + field_mapper.slug"
+                                :id="'a-create-collection-' + metadatum_mapper.slug"
                                 tag="div"
-                                :to="{ path: $routerHelper.getNewMappedCollectionPath(field_mapper.slug) }">
-                            {{ $i18n.get(field_mapper.name) }}
+                                :to="{ path: $routerHelper.getNewMappedCollectionPath(metadatum_mapper.slug) }">
+                            {{ $i18n.get(metadatum_mapper.name) }}
                         </router-link>
                     </b-dropdown-item>
                 </b-dropdown>
@@ -140,7 +140,7 @@ export default {
             totalCollections: 0,
             page: 1,
             collectionsPerPage: 12,
-            isLoadingFieldMappers: true,
+            isLoadingMetadatumMappers: true,
             status: ''
         }
     },
@@ -151,14 +151,14 @@ export default {
          ...mapActions('collection', [
             'fetchCollections',
         ]),
-        ...mapActions('fields', [
-            'fetchFieldMappers'
+        ...mapActions('metadata', [
+            'fetchMetadatumMappers'
         ]),
         ...mapGetters('collection', [
             'getCollections'
         ]),
-        ...mapGetters('fields', [
-            'getFieldMappers'
+        ...mapGetters('metadata', [
+            'getMetadatumMappers'
         ]),
         onChangeTab(status) {
             this.status = status;
@@ -192,9 +192,9 @@ export default {
         }
     },
     computed: {
-        field_mappers: {
+        metadatum_mappers: {
             get() {
-                return this.getFieldMappers();
+                return this.getMetadatumMappers();
             }
         },
         collections() {
@@ -202,7 +202,7 @@ export default {
         }
     },
     created() {
-        this.isLoadingFieldTypes = true;
+        this.isLoadingMetadatumTypes = true;
         this.$userPrefs.get('collections_per_page')
             .then((value) => {
                 this.collectionsPerPage = value;
@@ -210,12 +210,12 @@ export default {
             .catch(() => {
                 this.$userPrefs.set('collections_per_page', 12, null);
             });
-        this.fetchFieldMappers()
+        this.fetchMetadatumMappers()
             .then(() => {
-                this.isLoadingFieldMappers = false;
+                this.isLoadingMetadatumMappers = false;
             })
             .catch(() => {
-                this.isLoadingFieldMappers = false;
+                this.isLoadingMetadatumMappers = false;
             });
     },
     mounted(){
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index bb52ba529..1db8b3852 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -104,7 +104,7 @@
                     class="search-control">
                 <b-loading
                         :is-full-page="false"
-                        :active.sync="isLoadingFields"/>
+                        :active.sync="isLoadingMetadata"/>
                 <!-- Item Creation Dropdown, only on Admin -->
                 <div 
                         class="search-control-item"
@@ -136,12 +136,12 @@
                     </b-dropdown>
 
                 </div>
-                <!-- Displayed Fields Dropdown -->
+                <!-- Displayed Metadata Dropdown -->
                 <div    
                         v-if="!isOnTheme || registeredViewModes[viewMode].dynamic_metadata"
                         class="search-control-item">
                     <b-dropdown
-                            ref="displayedFieldsDropdown"
+                            ref="displayedMetadataDropdown"
                             :mobile-modal="false"
                             :disabled="totalItems <= 0 || adminViewMode == 'grid'"
                             class="show">
@@ -153,7 +153,7 @@
                         </button>
                         <div class="metadata-options-container">
                         <b-dropdown-item
-                                v-for="(column, index) in localTableFields"
+                                v-for="(column, index) in localTableMetadata"
                                 :key="index"
                                 class="control"
                                 custom>
@@ -166,7 +166,7 @@
                         </div>
                         <div class="dropdown-item-apply">
                             <button 
-                                    @click="onChangeDisplayedFields()"
+                                    @click="onChangeDisplayedMetadata()"
                                     class="button is-success">
                                 {{ $i18n.get('label_apply_changes') }}
                             </button>
@@ -182,19 +182,20 @@
                                 @input="onChangeOrderBy($event)"
                                 :placeholder="$i18n.get('label_sorting')">
                             <option
-                                    v-for="field in tableFields"
+                                    v-for="metadatum in tableMetadata"
                                     v-if="
-                                        field.id === 'creation_date' || 
-                                        field.id === 'author_name' || (
-                                            field.id !== undefined &&
-                                            field.field_type_object.related_mapped_prop !== 'description' &&
-                                            field.field_type_object.primitive_type !== 'term' &&
-                                            field.field_type_object.primitive_type !== 'item' &&
-                                            field.field_type_object.primitive_type !== 'compound'
+                                        metadatum.id === 'creation_date' ||
+                                        metadatum.id === 'author_name' || (
+                                            metadatum.id !== undefined &&
+                                            metadatum.metadatum_type_object && 
+                                            metadatum.metadatum_type_object.related_mapped_prop !== 'description' &&
+                                            metadatum.metadatum_type_object.primitive_type !== 'term' &&
+                                            metadatum.metadatum_type_object.primitive_type !== 'item' &&
+                                            metadatum.metadatum_type_object.primitive_type !== 'compound'
                                     )"
-                                    :value="field"
-                                    :key="field.id">
-                                {{ field.name }}
+                                    :value="metadatum"
+                                    :key="metadatum.id">
+                                {{ metadatum.name }}
                             </option>
                         </b-select>
                         <button
@@ -291,7 +292,7 @@
                 </div>
                 <advanced-search
                         :is-repository-level="isRepositoryLevel"
-                        :metadata-list="fields" />
+                        :metadata-list="metadata" />
             </div>
 
 
@@ -336,7 +337,7 @@
                               advancedSearchResults"
 
                         :collection-id="collectionId"
-                        :table-fields="tableFields"
+                        :table-metadata="tableMetadata"
                         :items="items"
                         :is-loading="isLoadingItems"
                         :is-on-trash="status == 'trash'"
@@ -350,7 +351,7 @@
                               !openAdvancedSearch"
 
                         :collection-id="collectionId"
-                        :table-fields="tableFields"
+                        :table-metadata="tableMetadata"
                         :items="items"
                         :is-loading="isLoadingItems"
                         :is-on-trash="status == 'trash'"
@@ -369,7 +370,7 @@
                               registeredViewModes[viewMode] != undefined &&
                               registeredViewModes[viewMode].type == 'component'"
                         :collection-id="collectionId"
-                        :table-fields="tableFields"
+                        :table-metadata="tableMetadata"
                         :items="items"
                         :is-loading="isLoadingItems"
                         :is="'table-view-mode'"/>     
@@ -430,18 +431,18 @@
         data() {
             return {
                 isRepositoryLevel: false,
-                tableFields: [],
-                prefTableFields: [],
+                tableMetadata: [],
+                prefTableMetadata: [],
                 isLoadingItems: false,
                 isLoadingFilters: false,
-                isLoadingFields: false,
+                isLoadingMetadata: false,
                 hasFiltered: false,
                 isFiltersMenuCompressed: false,
                 collapseAll: true,
                 isOnTheme: false,
                 futureSearchQuery: '',
                 isHeaderShrinked: false,
-                localTableFields: [],
+                localTableMetadata: [],
                 registeredViewModes: tainacan_plugin.registered_view_modes,
                 adminViewMode: 'table',
                 openAdvancedSearch: false,
@@ -466,8 +467,8 @@
             filters() {
                 return this.getFilters();
             },
-            fields() {
-                return this.getFields();
+            metadata() {
+                return this.getMetadata();
             },
             searchQuery() {
                 return this.getSearchQuery();
@@ -492,8 +493,8 @@
             AdvancedSearch,
         },
         watch: {
-            tableFields() {
-                this.localTableFields = JSON.parse(JSON.stringify(this.tableFields));
+            tableMetadata() {
+                this.localTableMetadata = JSON.parse(JSON.stringify(this.tableMetadata));
             }
         },
         methods: {
@@ -501,11 +502,11 @@
                 'getItems',
                 'getItemsListTemplate'
             ]),
-            ...mapActions('fields', [
-                'fetchFields'
+            ...mapActions('metadata', [
+                'fetchMetadata'
             ]),
-            ...mapGetters('fields', [
-                'getFields'
+            ...mapGetters('metadata', [
+                'getMetadata'
             ]),
             ...mapActions('filter', [
                 'fetchFilters'
@@ -524,8 +525,8 @@
             updateSearch() {
                 this.$eventBusSearch.setSearchQuery(this.futureSearchQuery);
             },  
-            onChangeOrderBy(field) {
-                this.$eventBusSearch.setOrderBy(field);
+            onChangeOrderBy(metadatum) {
+                this.$eventBusSearch.setOrderBy(metadatum);
             },
             onChangeOrder() {
                 this.order == 'DESC' ? this.$eventBusSearch.setOrder('ASC') : this.$eventBusSearch.setOrder('DESC');
@@ -536,31 +537,31 @@
             onChangeViewMode(viewMode) {
                 this.$eventBusSearch.setViewMode(viewMode);
             },
-            onChangeDisplayedFields() {
-                let fetchOnlyFieldIds = [];
+            onChangeDisplayedMetadata() {
+                let fetchOnlyMetadatumIds = [];
 
-                for (let i = 0; i < this.localTableFields.length; i++) {
+                for (let i = 0; i < this.localTableMetadata.length; i++) {
 
-                    this.tableFields[i].display = this.localTableFields[i].display;
-                    if (this.tableFields[i].id != undefined) {
-                        if (this.tableFields[i].display) {
-                            fetchOnlyFieldIds.push(this.tableFields[i].id);                      
+                    this.tableMetadata[i].display = this.localTableMetadata[i].display;
+                    if (this.tableMetadata[i].id != undefined) {
+                        if (this.tableMetadata[i].display) {
+                            fetchOnlyMetadatumIds.push(this.tableMetadata[i].id);
                         }
                     }
                 }
-                let thumbnailField = this.localTableFields.find(field => field.slug == 'thumbnail');
-                let creationDateField = this.localTableFields.find(field => field.slug == 'creation_date');
-                let authorNameField = this.localTableFields.find(field => field.slug == 'author_name');
+                let thumbnailMetadatum = this.localTableMetadata.find(metadatum => metadatum.slug == 'thumbnail');
+                let creationDateMetadatum = this.localTableMetadata.find(metadatum => metadatum.slug == 'creation_date');
+                let authorNameMetadatum = this.localTableMetadata.find(metadatum => metadatum.slug == 'author_name');
 
                 this.$eventBusSearch.addFetchOnly({
-                    '0': thumbnailField.display ? 'thumbnail' : null,
-                    'meta': fetchOnlyFieldIds,
-                    '1': creationDateField.display ? 'creation_date' : null,
-                    '2': authorNameField.display ? 'author_name': null
+                    '0': thumbnailMetadatum.display ? 'thumbnail' : null,
+                    'meta': fetchOnlyMetadatumIds,
+                    '1': creationDateMetadatum.display ? 'creation_date' : null,
+                    '2': authorNameMetadatum.display ? 'author_name': null
                 });
-                this.$refs.displayedFieldsDropdown.toggle();
+                this.$refs.displayedMetadataDropdown.toggle();
             },
-            prepareFieldsAndFilters() {
+            prepareMetadataAndFilters() {
 
                 this.isLoadingFilters = true;
 
@@ -573,89 +574,89 @@
                     .then(() => this.isLoadingFilters = false)
                     .catch(() => this.isLoadingFilters = false);
 
-                this.isLoadingFields = true;
+                this.isLoadingMetadata = true;
                 // Processing is done inside a local variable
-                let fields = [];
-                this.fetchFields({
+                let metadata = [];
+                this.fetchMetadata({
                     collectionId: this.collectionId,
                     isRepositoryLevel: this.isRepositoryLevel,
                     isContextEdit: !this.isOnTheme
                 })
                     .then(() => {
 
-                        fields.push({
+                        metadata.push({
                             name: this.$i18n.get('label_thumbnail'),
-                            field: 'row_thumbnail',
-                            field_type: undefined,
+                            metadatum: 'row_thumbnail',
+                            metadatum_type: undefined,
                             slug: 'thumbnail',
                             id: undefined,
                             display: true
                         });
 
-                        let fetchOnlyFieldIds = [];
+                        let fetchOnlyMetadatumIds = [];
 
-                        for (let field of this.fields) {
-                            if (field.display !== 'never') {
+                        for (let metadatum of this.metadata) {
+                            if (metadatum.display !== 'never') {
 
                                 let display;
 
-                                if (field.display == 'no')
+                                if (metadatum.display == 'no')
                                     display = false;
-                                else if (field.display == 'yes')
+                                else if (metadatum.display == 'yes')
                                     display = true;
 
-                                fields.push(
+                                metadata.push(
                                     {
-                                        name: field.name,
-                                        field: field.description,
-                                        slug: field.slug,
-                                        field_type: field.field_type,
-                                        field_type_object: field.field_type_object,
-                                        id: field.id,
+                                        name: metadatum.name,
+                                        metadatum: metadatum.description,
+                                        slug: metadatum.slug,
+                                        metadatum_type: metadatum.metadatum_type,
+                                        metadatum_type_object: metadatum.metadatum_type_object,
+                                        id: metadatum.id,
                                         display: display
                                     }
                                 );    
                                 if (display)
-                                    fetchOnlyFieldIds.push(field.id);                      
+                                    fetchOnlyMetadatumIds.push(metadatum.id);                      
                             }
                         }
 
-                        fields.push({
+                        metadata.push({
                             name: this.$i18n.get('label_creation_date'),
-                            field: 'row_creation',
-                            field_type: undefined,
+                            metadatum: 'row_creation',
+                            metadatum_type: undefined,
                             slug: 'creation_date',
                             id: undefined,
                             display: true
                         });
-                        fields.push({
+                        metadata.push({
                             name: this.$i18n.get('label_created_by'),
-                            field: 'row_author',
-                            field_type: undefined,
+                            metadatum: 'row_author',
+                            metadatum_type: undefined,
                             slug: 'author_name',
                             id: undefined,
                             display: true
                         });
 
-                        // this.prefTableFields = this.tableFields;
+                        // this.prefTableMetadata = this.tableMetadata;
                         // this.$userPrefs.get('table_columns_' + this.collectionId)
                         //     .then((value) => {
-                        //         this.prefTableFields = value;
+                        //         this.prefTableMetadata = value;
                         //     })
                         //     .catch((error) => {
-                        //         this.$userPrefs.set('table_columns_' + this.collectionId, this.prefTableFields, null);
+                        //         this.$userPrefs.set('table_columns_' + this.collectionId, this.prefTableMetadata, null);
                         //     });
                         this.$eventBusSearch.addFetchOnly({
                             '0': 'thumbnail',
-                            'meta': fetchOnlyFieldIds,
+                            'meta': fetchOnlyMetadatumIds,
                             '1': 'creation_date',
                             '2': 'author_name'
                         });
-                        this.isLoadingFields = false;
-                        this.tableFields = fields;
+                        this.isLoadingMetadata = false;
+                        this.tableMetadata = metadata;
                     })
                     .catch(() => {
-                        this.isLoadingFields = false;
+                        this.isLoadingMetadata = false;
                     });
             }
         },
@@ -675,12 +676,12 @@
                 this.hasFiltered = hasFiltered;
             });
 
-            this.$eventBusSearch.$on('hasToPrepareFieldsAndFilters', (to) => {
-                /* This condition is to prevent a incorrect fetch by filter or fields when we come from items
+            this.$eventBusSearch.$on('hasToPrepareMetadataAndFilters', (to) => {
+                /* This condition is to prevent a incorrect fetch by filter or metadata when we come from items
                  * at collection level to items page at repository level
                  */
                 if (this.collectionId === to.params.collectionId) {
-                    this.prepareFieldsAndFilters();
+                    this.prepareMetadataAndFilters();
                 }
             });
 
@@ -692,8 +693,8 @@
         },
         mounted() {
             
-            this.prepareFieldsAndFilters();
-            this.localTableFields = JSON.parse(JSON.stringify(this.tableFields));
+            this.prepareMetadataAndFilters();
+            this.localTableMetadata = JSON.parse(JSON.stringify(this.tableMetadata));
 
             // Watch Scroll for shrinking header, only on Admin at collection level
             if (!this.isRepositoryLevel && !this.isOnTheme) {
diff --git a/src/admin/pages/lists/fields-page.vue b/src/admin/pages/lists/metadata-page.vue
similarity index 63%
rename from src/admin/pages/lists/fields-page.vue
rename to src/admin/pages/lists/metadata-page.vue
index ae43d8a76..617cebe08 100644
--- a/src/admin/pages/lists/fields-page.vue
+++ b/src/admin/pages/lists/metadata-page.vue
@@ -1,21 +1,21 @@
 <template>
         <div class="primary-page page-container">
             <tainacan-title />
-            <fields-list/>    
+            <metadata-list/>
         </div>
 </template>
 
 <script>
-import FieldsList from '../../components/lists/fields-list.vue';
+import MetadataList from '../../components/lists/metadata-list.vue';
 
 export default {
-    name: 'FieldsPage',
+    name: 'MetadataPage',
     data(){
         return {
         }
     },
     components: {
-        FieldsList
+        MetadataList
     }
 }
 </script>
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index d63ec430a..4384dcf7a 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -89,7 +89,7 @@
             <div 
                     v-show="!isMetadataColumnCompressed"
                     class="column is-4-5">
-                <label class="section-label">{{ $i18n.get('fields') }}</label>
+                <label class="section-label">{{ $i18n.get('metadata') }}</label>
                 <br>
                 <a
                         class="collapse-all"
@@ -100,10 +100,10 @@
                             :icon=" open ? 'menu-down' : 'menu-right'"/>
                 </a>
 
-                <!-- Fields -------------------------------- -->
+                <!-- Metadata -------------------------------- -->
                 <div>
                     <div
-                            v-for="(field, index) of fieldList"
+                            v-for="(metadatum, index) of metadatumList"
                             :key="index"
                             class="field">
                         <b-collapse :open="open">
@@ -115,17 +115,17 @@
                                         type="is-secondary"
                                         :icon="props.open ? 'menu-down' : 'menu-right'"
                                 />
-                                {{ field.field.name }}
+                                {{ metadatum.metadatum.name }}
                             </label>
                             <div
-                                    v-if="field.date_i18n"
+                                    v-if="metadatum.date_i18n"
                                     class="content">
-                                <p v-html="field.date_i18n"/>
+                                <p v-html="metadatum.date_i18n"/>
                             </div>
                             <div
                                     v-else
                                     class="content">
-                                <p v-html="field.value_as_html"/>
+                                <p v-html="metadatum.value_as_html"/>
                             </div>
                         </b-collapse>
                     </div>
@@ -157,16 +157,16 @@
             ...mapActions('item', [
                 'fetchItem',
                 'fetchAttachments',
-                'fetchFields',
+                'fetchMetadata',
             ]),
             ...mapGetters('item', [
                 'getItem',
-                'getFields',
+                'getMetadata',
                 'getAttachments'
             ]),
             loadMetadata() {
-                // Obtains Item Field
-                this.fetchFields(this.itemId).then(() => {
+                // Obtains Item Metadatum
+                this.fetchMetadata(this.itemId).then(() => {
                     this.isLoading = false;
                 });
             },
@@ -175,8 +175,8 @@
             item() {
                 return this.getItem();
             },
-            fieldList() {
-                return JSON.parse(JSON.stringify(this.getFields()));
+            metadatumList() {
+                return JSON.parse(JSON.stringify(this.getMetadata()));
             },
             attachmentsList() {
                 return this.getAttachments();
diff --git a/src/admin/scss/_tainacan-form.scss b/src/admin/scss/_tainacan-form.scss
index bf9afa805..cf110e5e0 100644
--- a/src/admin/scss/_tainacan-form.scss
+++ b/src/admin/scss/_tainacan-form.scss
@@ -20,7 +20,7 @@
         display: inline-block;
         white-space: nowrap;
     }
-    .required-field-asterisk {
+    .required-metadatum-asterisk {
         color: $gray;
         &.is-danger {
             color: $danger;
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 12c9e3444..079b22c9f 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -12,13 +12,13 @@ return apply_filters('tainacan-admin-i18n',[
 	'repository'                               => __( 'Repository', 'tainacan' ),
 	'collections'                              => __( 'Collections', 'tainacan' ),
 	'items'                                    => __( 'Items', 'tainacan' ),
-	'fields'                                   => __( 'Metadata', 'tainacan' ),
+	'metadata'                                   => __( 'Metadata', 'tainacan' ),
 	'filters'                                  => __( 'Filters', 'tainacan' ),
 	'taxonomies'                               => __( 'Taxonomies', 'tainacan' ),
 	'events'                                   => __( 'Events', 'tainacan' ),
 	'collection'                               => __( 'Collection', 'tainacan' ),
 	'item'                                     => __( 'Item', 'tainacan' ),
-	'field'                                    => __( 'Metadata', 'tainacan' ),
+	'metadatum'                                    => __( 'Metadata', 'tainacan' ),
 	'filter'                                   => __( 'Filter', 'tainacan' ),
 	'taxonomy'                                 => __( 'Taxonomia', 'tainacan' ),
 	'event'                                    => __( 'Event', 'tainacan' ),
@@ -51,7 +51,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'new_blank_collection'                     => __( 'New Blank Collection', 'tainacan' ),
 	'split'                                    => __( 'Split', 'tainacan' ),
 	'unified'                                  => __( 'Unified', 'tainacan' ),
-	'add_more_one_search_field'                => __( 'Add more one search field', 'tainacan' ),
+	'add_more_one_search_metadatum'                => __( 'Add more one search metadatum', 'tainacan' ),
 	'clear_search'                             => __( 'Clear search', 'tainacan' ),
 
 	// Wordpress Status
@@ -66,14 +66,14 @@ return apply_filters('tainacan-admin-i18n',[
 	// Page Titles (used mainly on Router)
 	'title_repository_collections_page'        => __( 'Repository Collections', 'tainacan' ),
 	'title_items_page'                         => __( 'Items', 'tainacan' ),
-	'title_repository_fields_page'             => __( 'Repository Metadata', 'tainacan' ),
+	'title_repository_metadata_page'             => __( 'Repository Metadata', 'tainacan' ),
 	'title_repository_filters_page'            => __( 'Repository Filters', 'tainacan' ),
 	'title_categories_page'                    => __( 'Categories Page', 'tainacan' ),
 	'title_terms_page'                         => __( 'Terms', 'tainacan' ),
 	'title_repository_events_page'             => __( 'Repository Events', 'tainacan' ),
 	'title_collection_page'                    => __( 'Collection', 'tainacan' ),
 	'title_item_page'                          => __( 'Item', 'tainacan' ),
-	'title_field_page'                         => __( 'Metadata', 'tainacan' ),
+	'title_metadatum_page'                         => __( 'Metadata', 'tainacan' ),
 	'title_collection_events'                  => __( 'Collection Events', 'tainacan' ),
 	'title_filter_page'                        => __( 'Filter', 'tainacan' ),
 	'title_category_page'                      => __( 'Taxonomy', 'tainacan' ),
@@ -87,8 +87,8 @@ return apply_filters('tainacan-admin-i18n',[
 	'title_edit_item'     	                   => __( 'Edit Item', 'tainacan' ),
 	'title_category_edition_page'              => __( 'Taxonomy Edition', 'tainacan' ),
 	'title_filter_edition'                     => __( 'Filter Edition', 'tainacan' ),
-	'title_field_edition'                      => __( 'Metadata Edition', 'tainacan' ),
-	'title_collection_fields_edition'          => __( 'Edit Metadata of', 'tainacan' ),
+	'title_metadatum_edition'                      => __( 'Metadata Edition', 'tainacan' ),
+	'title_collection_metadata_edition'          => __( 'Edit Metadata of', 'tainacan' ),
 	'title_collection_filters_edition'         => __( 'Edit Filters of', 'tainacan' ),
 
 	// Labels (used mainly on Aria Labels and Inputs)
@@ -124,9 +124,9 @@ return apply_filters('tainacan-admin-i18n',[
 	'label_categories_per_page'                => __( 'Categories per Page:', 'tainacan' ),
 	'label_events_per_page'                    => __( 'Events per Page:', 'tainacan' ),
 	'label_items_per_page'                     => __( 'Items per Page:', 'tainacan' ),
-	'label_active_fields'                      => __( 'Active Metadata', 'tainacan' ),
-	'label_available_fields'                   => __( 'Available Metadata', 'tainacan' ),
-	'label_available_field_types'              => __( 'Available Metadata Types', 'tainacan' ),
+	'label_active_metadata'                      => __( 'Active Metadata', 'tainacan' ),
+	'label_available_metadata'                   => __( 'Available Metadata', 'tainacan' ),
+	'label_available_metadatum_types'              => __( 'Available Metadata Types', 'tainacan' ),
 	'label_active_filters'                     => __( 'Active Filters', 'tainacan' ),
 	'label_filter_type'                        => __( 'Filter Type', 'tainacan' ),
 	'label_available_filters'                  => __( 'Available Filters', 'tainacan' ),
@@ -141,7 +141,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'label_no'                                 => __( 'No', 'tainacan' ),
 	'label_approved'                                 => __( 'Approved', 'tainacan' ),
 	'label_collection_related'                 => __( 'Collection Related', 'tainacan' ),
-	'label_fields_for_search'                  => __( 'Metadata for search', 'tainacan' ),
+	'label_metadata_for_search'                  => __( 'Metadata for search', 'tainacan' ),
 	'label_allow_repeated_items'               => __( 'Allow repeated items', 'tainacan' ),
 	'label_select_category'                    => __( 'Select taxonomy', 'tainacan' ),
 	'label_select_category_input_type'         => __( 'Input type', 'tainacan' ),
@@ -155,7 +155,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'label_creation'                      => __( 'Creation', 'tainacan' ),
 	'label_creation_date'                      => __( 'Creation date', 'tainacan' ),
 	'label_collection_items'                   => __( 'Collection Items', 'tainacan' ),
-	'label_collection_fields'                  => __( 'Collection Metadata', 'tainacan' ),
+	'label_collection_metadata'                  => __( 'Collection Metadata', 'tainacan' ),
 	'label_collection_filters'                 => __( 'Collection Filters', 'tainacan' ),
 	'label_parent_term'                        => __( 'Parent Term', 'tainacan' ),
 	'label_new_term'                           => __( 'New Term', 'tainacan' ),
@@ -171,7 +171,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'label_empty_header_image'                 => __( 'Empty Header Image', 'tainacan' ),
 	'label_enable_cover_page'                  => __( 'Enable Cover Page', 'tainacan' ),
 	'label_cover_page'                         => __( 'Cover Page', 'tainacan' ),
-	'label_default_displayed_fields'           => __( 'Default Displayed Metadata', 'tainacan' ),
+	'label_default_displayed_metadata'           => __( 'Default Displayed Metadata', 'tainacan' ),
 	'label_display'                            => __( 'Display on Listing', 'tainacan' ),
 	'label_display_default'                    => __( 'Display by default', 'tainacan' ),
 	'label_display_never'                      => __( 'Never displayed', 'tainacan' ),
@@ -270,7 +270,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'info_warning_selected_items_trash'       => __( 'Do you really want to trash the selected items?', 'tainacan' ),
 	'info_warning_selected_categories_delete'  => __( 'Do you really want to delete the selected categories?', 'tainacan' ),
 	'info_warning_collection_related'          => __( 'The metadata Collection related is required', 'tainacan' ),
-	'info_warning_no_fields_found'             => __( 'No metadata found in this collection', 'tainacan' ),
+	'info_warning_no_metadata_found'             => __( 'No metadata found in this collection', 'tainacan' ),
 	'info_showing_items'                       => __( 'Showing items ', 'tainacan' ),
 	'info_showing_collections'                 => __( 'Showing collections ', 'tainacan' ),
 	'info_showing_categories'                  => __( 'Showing categories ', 'tainacan' ),
@@ -282,7 +282,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'info_date'                                => __( 'Date: ', 'tainacan' ),
 	'info_not_saved'                           => __( 'Not saved ', 'tainacan' ),
 	'info_warning_item_not_saved'              => __( 'Are you sure? The item is not saved, changes will be lost.', 'tainacan' ),
-	'info_warning_fields_not_saved'            => __( 'Are you sure? There are metadata not saved, changes will be lost.', 'tainacan' ),
+	'info_warning_metadata_not_saved'            => __( 'Are you sure? There are metadata not saved, changes will be lost.', 'tainacan' ),
 	'info_warning_filters_not_saved'           => __( 'Are you sure? There are filters not saved, changes will be lost.', 'tainacan' ),
 	'info_no_description_provided'             => __( 'No description provided.', 'tainacan' ),
 	'info_warning_category_not_saved'          => __( 'Are you sure? The metadata is not saved, changes will be lost.', 'tainacan' ),
@@ -291,7 +291,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'info_no_events'                           => __( 'No events', 'tainacan' ),
 	'info_logs_before'                         => __( 'Before updating', 'tainacan' ),
 	'info_logs_after'                          => __( 'What was updated', 'tainacan' ),
-	'info_there_is_no_field'                   => __( 'There is no metadata here yet.', 'tainacan' ),
+	'info_there_is_no_metadatum'                   => __( 'There is no metadata here yet.', 'tainacan' ),
 	'info_there_is_no_filter'                  => __( 'There is no filter here yet.', 'tainacan' ),
 	'info_changes'                             => __( 'Changes', 'tainacan' ),
 	'info_possible_external_sources'           => __( 'Possible external sources: CSV, Instagram, Youtube, etc.', 'tainacan' ),
@@ -304,7 +304,7 @@ return apply_filters('tainacan-admin-i18n',[
 	'info_create_metadata'	   				   => __( 'Click or Drag and Drop Metadata Types here for creating a new Metadata.', 'tainacan' ),
 	'info_choose_your_metadata'	   			   => __( 'Choose your metadata.', 'tainacan' ),
 
-	// Tainacan Field Types
+	// Tainacan Metadatum Types
 	'tainacan-text'                            => __( 'Text', 'tainacan' ),
 	'tainacan-textarea'                        => __( 'Text area', 'tainacan' ),
 	'tainacan-date'                            => __( 'Date', 'tainacan' ),
diff --git a/src/api/class-tainacan-rest-controller.php b/src/api/class-tainacan-rest-controller.php
index 23c0ce12e..f43cd8d9b 100644
--- a/src/api/class-tainacan-rest-controller.php
+++ b/src/api/class-tainacan-rest-controller.php
@@ -86,11 +86,11 @@ class REST_Controller extends \WP_REST_Controller {
 		];
 
 		$meta_query = [
-			'key'       => 'key',
-			'value'     => 'value',
-			'compare'   => 'compare',
-			'relation'  => 'relation',
-			'fieldtype' => 'type',
+			'key'       	=> 'key',
+			'value'     	=> 'value',
+			'compare'   	=> 'compare',
+			'relation'  	=> 'relation',
+			'metadatumtype' => 'type',
 		];
 
 		$date_query = [
@@ -109,11 +109,11 @@ class REST_Controller extends \WP_REST_Controller {
 		];
 
 		$tax_query = [
-			'taxonomy' => 'taxonomy',
-			'field'    => 'field',
-			'terms'    => 'terms',
-			'operator' => 'operator',
-			'relation' => 'relation',
+			'taxonomy'  => 'taxonomy',
+			'metadatum' => 'field',
+			'terms'     => 'terms',
+			'operator'  => 'operator',
+			'relation'  => 'relation',
 		];
 
 		$args = [];
@@ -140,12 +140,12 @@ class REST_Controller extends \WP_REST_Controller {
 
 	/**
 	 * @param $data
-	 * @param $field_name
+	 * @param $metadatum_name
 	 * @param $request
 	 *
 	 * @return \WP_Error
 	 */
-	function gt_user_meta( $data, $field_name, $request ) {
+	function gt_user_meta( $data, $metadatum_name, $request ) {
 		if( $data['id'] ){
 			$user_meta = get_user_meta( $data['id'] );
 		}
@@ -164,19 +164,19 @@ class REST_Controller extends \WP_REST_Controller {
 	/**
 	 * @param $meta
 	 * @param $user
-	 * @param $field_name
+	 * @param $metadatum_name
 	 *
 	 * @param $request
 	 *
 	 * @return mixed|\WP_Error
 	 */
-	public function up_user_meta( $meta, $user, $field_name, $request ) {
+	public function up_user_meta( $meta, $user, $metadatum_name, $request ) {
 		if ( !$user->ID ) {
 			return new \WP_Error( 'No user found', 'No user found', array( 'status' => 404 ) );
 		}
 
 		$user_id = $user->ID;
-		$metas = $field_name === 'meta' ? $meta : [];
+		$metas = $metadatum_name === 'meta' ? $meta : [];
 
 		$map = [
 			'metakey',
@@ -244,16 +244,16 @@ class REST_Controller extends \WP_REST_Controller {
 
 			foreach ( $request_meta_query as $index1 => $a ) {
 
-                // handle core field
+                // handle core metadatum
                 if( is_array($a) && array_key_exists("key", $a) ){
-                    $field = new \Tainacan\Entities\Field($a['key']);
-                    if( strpos( $field->get_field_type(), 'Core_Title') !== false ){
+                    $metadatum = new \Tainacan\Entities\Metadatum($a['key']);
+                    if( strpos( $metadatum->get_metadatum_type(), 'Core_Title') !== false ){
                         $args[ 'post_title_in' ] = [
                             'relation' => ( isset( $request_meta_query['relation']) ) ? $request_meta_query['relation'] : 'AND' ,
                             'value' => ( is_array( $a['value'] ) ) ? $a['value'] : [$a['value']]
                         ];
                         continue;
-                    } else if( strpos( $field->get_field_type(), 'Core_Description') !== false ) {
+                    } else if( strpos( $metadatum->get_metadatum_type(), 'Core_Description') !== false ) {
                         $args[ 'post_content_in' ] = [
                             'relation' => ( isset( $request_meta_query['relation']) ) ? $request_meta_query['relation'] : 'AND' ,
                             'value' => ( is_array( $a['value'] ) ) ? $a['value'] : [$a['value']]
@@ -435,7 +435,7 @@ class REST_Controller extends \WP_REST_Controller {
 							'description' => __('OR or AND, how the sub-arrays should be compared.'),
 							'default'     => 'AND',
 						),
-						'fieldtype' => array(
+						'metadatumtype' => array(
 							'type'        => 'string',
 							'description' => __('Custom metadata type. Possible values are NUMERIC, BINARY, CHAR, DATE, DATETIME, DECIMAL, SIGNED, TIME, UNSIGNED. Default value is CHAR. You can also specify precision and scale for the DECIMAL and NUMERIC types (for example, DECIMAL(10,5) or NUMERIC(10) are valid). The type DATE works with the compare value BETWEEN only if the date is stored at the format YYYY-MM-DD and tested with this format.'),
 						),
@@ -507,7 +507,7 @@ class REST_Controller extends \WP_REST_Controller {
 							'type'        => 'string',
 							'description' => __('The taxonomy data base identifier.')
 						),
-						'field'    => array(
+						'metadatum'    => array(
 							'type'        => 'string',
 							'description' => __('Select taxonomy term by. Possible values are term_id, name, slug or term_taxonomy_id. Default value is term_id.')
 						),
diff --git a/src/api/endpoints/class-tainacan-rest-export-controller.php b/src/api/endpoints/class-tainacan-rest-export-controller.php
index 36c80e912..ba95c93d1 100644
--- a/src/api/endpoints/class-tainacan-rest-export-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-export-controller.php
@@ -11,7 +11,7 @@ class REST_Export_Controller extends REST_Controller {
 	private $item_metadata_repository;
 	private $items_repository;
 	private $collection_repository;
-	private $field_repository;
+	private $metadatum_repository;
 
 	public function __construct() {
 		$this->rest_base = 'export';
@@ -25,20 +25,20 @@ class REST_Export_Controller extends REST_Controller {
 	 * @throws \Exception
 	 */
 	public function init_objects() {
-		$this->field_repository = Repositories\Fields::get_instance();
+		$this->metadatum_repository = Repositories\Metadata::get_instance();
 		$this->item_metadata_repository = Repositories\Item_Metadata::get_instance();
 		$this->items_repository = Repositories\Items::get_instance();
 		$this->collection_repository = Repositories\Collections::get_instance();
 	}
 
 	/**
-	 * If POST on field/collection/<collection_id>, then
-	 * a field will be created in matched collection and all your item will receive this field
+	 * If POST on metadatum/collection/<collection_id>, then
+	 * a metadatum will be created in matched collection and all your item will receive this metadatum
 	 *
-	 * If POST on field/item/<item_id>, then a value will be added in a field and field passed
+	 * If POST on metadatum/item/<item_id>, then a value will be added in a metadatum and metadatum passed
 	 * id body of requisition
 	 *
-	 * Both of GETs return the field of matched objects
+	 * Both of GETs return the metadatum of matched objects
 	 *
 	 * @throws \Exception
 	 */
@@ -82,15 +82,15 @@ class REST_Export_Controller extends REST_Controller {
 	 */
 	public function get_item( $request ) {
 		/*$collection_id = $request['collection_id'];
-		$field_id = $request['field_id'];
+		$metadatum_id = $request['metadatum_id'];
 
-		if($request['fetch'] === 'all_field_values'){
-			$results = $this->field_repository->fetch_all_field_values($collection_id, $field_id);
+		if($request['fetch'] === 'all_metadatum_values'){
+			$results = $this->metadatum_repository->fetch_all_metadatum_values($collection_id, $metadatum_id);
 
 			return new \WP_REST_Response($results, 200);
 		}
 
-		$result = $this->field_repository->fetch($field_id, 'OBJECT');
+		$result = $this->metadatum_repository->fetch($metadatum_id, 'OBJECT');
 
 		$prepared_item = $this->prepare_item_for_response($result, $request);
 		return new \WP_REST_Response(apply_filters('tainacan-rest-response', $prepared_item, $request), 200);*/
@@ -133,7 +133,7 @@ class REST_Export_Controller extends REST_Controller {
 	 * @return array|\WP_Error|\WP_REST_Response
 	 */
 	public function prepare_item_for_response( $item, $request ) {
-		$items_metadata = $item->get_fields();
+		$items_metadata = $item->get_metadata();
 		
 		$prepared_item = [];
 		
diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/api/endpoints/class-tainacan-rest-filters-controller.php
index 7a93f4c13..f16dc5d9c 100644
--- a/src/api/endpoints/class-tainacan-rest-filters-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-filters-controller.php
@@ -10,8 +10,8 @@ class REST_Filters_Controller extends REST_Controller {
 	private $collection;
 	private $collection_repository;
 
-	private $field;
-	private $field_repository;
+	private $metadatum;
+	private $metadatum_repository;
 
 	private $filter_repository;
 
@@ -31,13 +31,13 @@ class REST_Filters_Controller extends REST_Controller {
 		$this->collection = new Entities\Collection();
 		$this->collection_repository = Repositories\Collections::get_instance();
 		
-		$this->field_repository = Repositories\Fields::get_instance();
+		$this->metadatum_repository = Repositories\Metadata::get_instance();
 		
 		$this->filter_repository = Repositories\Filters::get_instance();
 	}
 
 	public function register_routes() {
-		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/field/(?P<field_id>[\d]+)/' . $this->rest_base, array(
+		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/metadatum/(?P<metadatum_id>[\d]+)/' . $this->rest_base, array(
 			array(
 				'methods'             => \WP_REST_Server::CREATABLE,
 				'callback'            => array($this, 'create_item'),
@@ -131,30 +131,30 @@ class REST_Filters_Controller extends REST_Controller {
 			$filter_obj->set($attribute, $value);
 		}
 
-		if(isset($request['collection_id']) && isset($request['field_id'])) {
+		if(isset($request['collection_id']) && isset($request['metadatum_id'])) {
 			$collection_id = $request['collection_id'];
-			$field_id      = $request['field_id'];
+			$metadatum_id      = $request['metadatum_id'];
 
 			$filter_obj->set_collection_id( $collection_id );
-			$filter_obj->set_field( $field_id );
+			$filter_obj->set_metadatum( $metadatum_id );
 		} elseif (isset($request['collection_id'])){
 			$collection_id = $request['collection_id'];
 
 			$filter_obj->set_collection_id( $collection_id );
 
-			if(!isset($body['field'])){
-				throw new \InvalidArgumentException('You need provide a field id');
+			if(!isset($body['metadatum'])){
+				throw new \InvalidArgumentException('You need provide a metadatum id');
 			}
 
-			$filter_obj->set_field($body['field']);
+			$filter_obj->set_metadatum($body['metadatum']);
 		} else {
 			$filter_obj->set_collection_id( 'filter_in_repository' );
 
-			if(!isset($body['field'])){
-				throw new \InvalidArgumentException('You need provide a field id');
+			if(!isset($body['metadatum'])){
+				throw new \InvalidArgumentException('You need provide a metadatum id');
 			}
 
-			$filter_obj->set_field($body['field']);
+			$filter_obj->set_metadatum($body['metadatum']);
 		}
 
 		$filter_obj->set_filter_type($filter_type);
@@ -197,11 +197,11 @@ class REST_Filters_Controller extends REST_Controller {
 	 * @throws \Exception
 	 */
 	public function create_item_permissions_check( $request ) {
-		if(isset($request['collection_id']) && isset($request['field_id'])) {
-			$metadata   = $this->field_repository->fetch( $request['field_id'] );
+		if(isset($request['collection_id']) && isset($request['metadatum_id'])) {
+			$metadata   = $this->metadatum_repository->fetch( $request['metadatum_id'] );
 			$collection = $this->collection_repository->fetch( $request['collection_id'] );
 
-			if ( ( $metadata instanceof Entities\Field ) && ( $collection instanceof Entities\Collection ) ) {
+			if ( ( $metadata instanceof Entities\Metadatum ) && ( $collection instanceof Entities\Collection ) ) {
 				return $this->filter_repository->can_edit( new Entities\Filter() ) && $metadata->can_edit() && $collection->can_edit();
 			}
 
@@ -214,7 +214,7 @@ class REST_Filters_Controller extends REST_Controller {
 
 		}
 
-		return $this->filter_repository->can_edit(new Entities\Field());
+		return $this->filter_repository->can_edit(new Entities\Metadatum());
 	}
 
 	/**
diff --git a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
index d2c394df0..eb6b8eb75 100644
--- a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
@@ -7,11 +7,11 @@ use Tainacan\Entities;
 use Tainacan\Repositories;
 
 class REST_Item_Metadata_Controller extends REST_Controller {
-	private $field;
+	private $metadatum;
 	private $item_metadata_repository;
 	private $item_repository;
 	private $collection_repository;
-	private $field_repository;
+	private $metadatum_repository;
 
 	public function __construct() {
 		$this->rest_base = 'metadata';
@@ -23,24 +23,24 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 	 * Initialize objects after post_type register
 	 */
 	public function init_objects() {
-		$this->field = new Entities\Field();
-		$this->field_repository = Repositories\Fields::get_instance();
+		$this->metadatum = new Entities\Metadatum();
+		$this->metadatum_repository = Repositories\Metadata::get_instance();
 		$this->item_metadata_repository = Repositories\Item_Metadata::get_instance();
 		$this->item_repository = Repositories\Items::get_instance();
 		$this->collection_repository = Repositories\Collections::get_instance();
 	}
 
 	/**
-	 * If POST on field/collection/<collection_id>, then
-	 * a field will be created in matched collection and all your item will receive this field
+	 * If POST on metadatum/collection/<collection_id>, then
+	 * a metadatum will be created in matched collection and all your item will receive this metadatum
 	 *
-	 * If POST on field/item/<item_id>, then a value will be added in a field and field passed
+	 * If POST on metadatum/item/<item_id>, then a value will be added in a metadatum and metadatum passed
 	 * id body of requisition
 	 *
-	 * Both of GETs return the field of matched objects
+	 * Both of GETs return the metadatum of matched objects
 	 */
 	public function register_routes() {
-		register_rest_route($this->namespace, '/item/(?P<item_id>[\d]+)/' . $this->rest_base . '/(?P<metadata_id>[\d]+)',
+		register_rest_route($this->namespace, '/item/(?P<item_id>[\d]+)/' . $this->rest_base . '/(?P<metadatum_id>[\d]+)',
 			array(
 				array(
 					'methods'             => \WP_REST_Server::EDITABLE,
@@ -60,11 +60,11 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 				)
 			)
 		);
-		register_rest_route($this->namespace,  '/item/(?P<item_id>[\d]+)/'. $this->rest_base. '/(?P<metadata_id>[\d]+)',
+		register_rest_route($this->namespace,  '/item/(?P<item_id>[\d]+)/'. $this->rest_base. '/(?P<metadatum_id>[\d]+)',
 			array(
 				array(
 					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array($this, 'get_item_field_value'),
+					'callback'            => array($this, 'get_item_metadatum_value'),
 					'permission_callback' => array($this, 'get_items_permissions_check'),
 				)
 			)
@@ -81,12 +81,12 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 
 		foreach ($meta as $key => $value){
 			$set_ = 'set_' . $key;
-			$this->field->$set_($value);
+			$this->metadatum->$set_($value);
 		}
 
 		$collection = new Entities\Collection($request[1]);
 
-		$this->field->set_collection($collection);
+		$this->metadatum->set_collection($collection);
 	}
 
 	/**
@@ -115,13 +115,13 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 
 		$item = $this->item_repository->fetch($item_id);
 
-		$items_metadata = $item->get_fields();
+		$items_metadata = $item->get_metadata();
 
 		$prepared_item = [];
 
 		foreach ($items_metadata as $item_metadata){
 			$index = array_push($prepared_item, $this->prepare_item_for_response($item_metadata, $request));
-			$prepared_item[$index-1]['field']['field_type_object'] = $this->prepare_item_for_response( $item_metadata->get_field()->get_field_type_object(), $request);
+			$prepared_item[$index-1]['metadatum']['metadatum_type_object'] = $this->prepare_item_for_response( $item_metadata->get_metadatum()->get_metadatum_type_object(), $request);
 		}
 
 		return new \WP_REST_Response(apply_filters('tainacan-rest-response', $prepared_item, $request), 200);
@@ -132,21 +132,21 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 	 *
 	 * @return \WP_Error|\WP_REST_Response
 	 */
-	public function get_item_field_value( $request ) {
+	public function get_item_metadatum_value( $request ) {
 		$item_id = $request['item_id'];
-		$field_id = $request['metadata_id'];
+		$metadatum_id = $request['metadatum_id'];
 		
 		$item = $this->item_repository->fetch($item_id);
 		
-		$items_metadata = $item->get_fields();
+		$items_metadata = $item->get_metadata();
 		
 		$prepared_item = '';
 		
 		foreach ($items_metadata as $item_metadata){
-			$field = $item_metadata->get_field();
-			if($field->get_id() == $field_id) {
+			$metadatum = $item_metadata->get_metadatum();
+			if($metadatum->get_id() == $metadatum_id) {
 				$prepared_item = $this->prepare_item_for_response($item_metadata, $request);
-				$prepared_item['field']['field_type_object'] = $this->prepare_item_for_response( $field->get_field_type_object(), $request);
+				$prepared_item['metadatum']['metadatum_type_object'] = $this->prepare_item_for_response( $metadatum->get_metadatum_type_object(), $request);
 			}
 		}
 		
@@ -184,13 +184,13 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 		if($body) {
 
 			$item_id  = $request['item_id'];
-			$field_id = $request['metadata_id'];
+			$metadatum_id = $request['metadatum_id'];
 			$value    = $body['values'];
 
 			$item  = $this->item_repository->fetch( $item_id );
-			$field = $this->field_repository->fetch( $field_id );
+			$metadatum = $this->metadatum_repository->fetch( $metadatum_id );
 
-			$item_metadata = new Entities\Item_Metadata_Entity( $item, $field );
+			$item_metadata = new Entities\Item_Metadata_Entity( $item, $metadatum );
 
 			if($item_metadata->is_multiple()) {
 				$item_metadata->set_value( $value );
@@ -202,18 +202,18 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 
 			if ( $item_metadata->validate() ) {
 				if($item->can_edit()) {
-					$field_updated = $this->item_metadata_repository->update( $item_metadata );
+					$metadatum_updated = $this->item_metadata_repository->update( $item_metadata );
 
-					$prepared_item =  $this->prepare_item_for_response($field_updated, $request);
-					$prepared_item['field']['field_type_object'] = $this->prepare_item_for_response($field_updated->get_field()->get_field_type_object(), $request);
+					$prepared_item =  $this->prepare_item_for_response($metadatum_updated, $request);
+					$prepared_item['metadatum']['metadatum_type_object'] = $this->prepare_item_for_response($metadatum_updated->get_metadatum()->get_metadatum_type_object(), $request);
 				}
-				elseif($field->get_accept_suggestion()) {
+				elseif($metadatum->get_accept_suggestion()) {
 					$log = $this->item_metadata_repository->suggest( $item_metadata );
 					$prepared_item = $log->_toArray();
 				}
 				else {
 					return new \WP_REST_Response( [
-						'error_message' => __( 'The metadata does not accept suggestions', 'tainacan' ),
+						'error_message' => __( 'The metadatum does not accept suggestions', 'tainacan' ),
 					], 400 );
 				}
 
@@ -248,9 +248,9 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 					return $item->can_edit();
 				}
 				else {
-					$field_id = $request['metadata_id'];
-					$field = $this->field_repository->fetch( $field_id );
-					return 'publish' === $field->get_status() && $field->get_accept_suggestion();
+					$metadatum_id = $request['metadatum_id'];
+					$metadatum = $this->metadatum_repository->fetch( $metadatum_id );
+					return 'publish' === $metadatum->get_status() && $metadatum->get_accept_suggestion();
 				}
 			}
 
diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php
index 21cb12e33..0ee284f54 100644
--- a/src/api/endpoints/class-tainacan-rest-items-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-items-controller.php
@@ -109,22 +109,22 @@ class REST_Items_Controller extends REST_Controller {
 	 * @return mixed
 	 */
 	private function add_metadata_to_item($item_object, $item_array, $args = []){
-		$item_metadata = $item_object->get_fields($args);
+		$item_metadata = $item_object->get_metadata($args);
 
 		foreach($item_metadata as $index => $me){
-			$field               = $me->get_field();
-			$slug                = $field->get_slug();
+			$metadatum               = $me->get_metadatum();
+			$slug                = $metadatum->get_slug();
 			$item_metadata_array = $me->_toArray();
 
-			$item_array['metadata'][ $slug ]['name']            = $field->get_name();
-			if($field->get_field_type_object()->get_primitive_type() === 'date') {
+			$item_array['metadata'][ $slug ]['name']            = $metadatum->get_name();
+			if($metadatum->get_metadatum_type_object()->get_primitive_type() === 'date') {
 				$item_array['metadata'][ $slug ]['date_i18n'] = $item_metadata_array['date_i18n'];
 			} else {
 				$item_array['metadata'][ $slug ]['value']           = $item_metadata_array['value'];
 				$item_array['metadata'][ $slug ]['value_as_html']   = $item_metadata_array['value_as_html'];
 				$item_array['metadata'][ $slug ]['value_as_string'] = $item_metadata_array['value_as_string'];
 			}
-			$item_array['metadata'][ $slug ]['multiple']        = $field->get_multiple();
+			$item_array['metadata'][ $slug ]['multiple']        = $metadatum->get_multiple();
 		}
 
 		return $item_array;
@@ -238,11 +238,11 @@ class REST_Items_Controller extends REST_Controller {
 			
 			ob_start();
 
-			global $wp_query, $view_mode_displayed_fields;
+			global $wp_query, $view_mode_displayed_metadata;
 			$wp_query = $items;
 			$displayed_metadata = array_map(function($el) { return (int) $el; }, $request['fetch_only']['meta']);
-			$view_mode_displayed_fields = $request['fetch_only'];
-			$view_mode_displayed_fields['meta'] = $displayed_metadata;
+			$view_mode_displayed_metadata = $request['fetch_only'];
+			$view_mode_displayed_metadata['meta'] = $displayed_metadata;
 			
 			include $view_mode['template'];
 			
diff --git a/src/api/endpoints/class-tainacan-rest-fields-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
similarity index 77%
rename from src/api/endpoints/class-tainacan-rest-fields-controller.php
rename to src/api/endpoints/class-tainacan-rest-metadata-controller.php
index ba7f39b55..c4e28715d 100644
--- a/src/api/endpoints/class-tainacan-rest-fields-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
@@ -6,14 +6,14 @@ use \Tainacan\API\REST_Controller;
 use Tainacan\Entities;
 use Tainacan\Repositories;
 
-class REST_Fields_Controller extends REST_Controller {
+class REST_Metadata_Controller extends REST_Controller {
 	private $item_metadata_repository;
 	private $item_repository;
 	private $collection_repository;
-	private $field_repository;
+	private $metadatum_repository;
 
 	public function __construct() {
-		$this->rest_base = 'fields';
+		$this->rest_base = 'metadata';
 		parent::__construct();
 		add_action('init', array(&$this, 'init_objects'), 11);
 	}
@@ -24,25 +24,25 @@ class REST_Fields_Controller extends REST_Controller {
 	 * @throws \Exception
 	 */
 	public function init_objects() {
-		$this->field_repository = Repositories\Fields::get_instance();
+		$this->metadatum_repository = Repositories\Metadata::get_instance();
 		$this->item_metadata_repository = Repositories\Item_Metadata::get_instance();
 		$this->item_repository = Repositories\Items::get_instance();
 		$this->collection_repository = Repositories\Collections::get_instance();
 	}
 
 	/**
-	 * If POST on field/collection/<collection_id>, then
-	 * a field will be created in matched collection and all your item will receive this field
+	 * If POST on metadatum/collection/<collection_id>, then
+	 * a metadatum will be created in matched collection and all your item will receive this metadatum
 	 *
-	 * If POST on field/item/<item_id>, then a value will be added in a field and field passed
+	 * If POST on metadatum/item/<item_id>, then a value will be added in a metadatum and metadatum passed
 	 * id body of requisition
 	 *
-	 * Both of GETs return the field of matched objects
+	 * Both of GETs return the metadatum of matched objects
 	 *
 	 * @throws \Exception
 	 */
 	public function register_routes() {
-		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<field_id>[\d]+)',
+		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<metadatum_id>[\d]+)',
 			array(
 				array(
 					'methods'             => \WP_REST_Server::EDITABLE,
@@ -96,7 +96,7 @@ class REST_Fields_Controller extends REST_Controller {
 				)
 			)
 		);
-		register_rest_route($this->namespace, '/'. $this->rest_base . '/(?P<field_id>[\d]+)',
+		register_rest_route($this->namespace, '/'. $this->rest_base . '/(?P<metadatum_id>[\d]+)',
 			array(
 				// ENDPOINT Z.
 				array(
@@ -127,28 +127,28 @@ class REST_Fields_Controller extends REST_Controller {
 	 */
 	public function get_item( $request ) {
 		$collection_id = isset($request['collection_id']) ? $request['collection_id'] : false;
-		$field_id = $request['field_id'];
+		$metadatum_id = $request['metadatum_id'];
 
-		if($request['fetch'] === 'all_field_values' && $request['search']){
+		if($request['fetch'] === 'all_metadatum_values' && $request['search']){
 			if($collection_id) {
-				$results = $this->field_repository->fetch_all_field_values( $collection_id, $field_id, $request['search'] );
+				$results = $this->metadatum_repository->fetch_all_metadatum_values( $collection_id, $metadatum_id, $request['search'] );
 			} else {
-				$results = $this->field_repository->fetch_all_field_values( null, $field_id, $request['search']);
+				$results = $this->metadatum_repository->fetch_all_metadatum_values( null, $metadatum_id, $request['search']);
 			}
 
 			return new \WP_REST_Response($results, 200);
 
-		} elseif($request['fetch'] === 'all_field_values') {
+		} elseif($request['fetch'] === 'all_metadatum_values') {
 			if($collection_id) {
-				$results = $this->field_repository->fetch_all_field_values( $collection_id, $field_id );
+				$results = $this->metadatum_repository->fetch_all_metadatum_values( $collection_id, $metadatum_id );
 			} else {
-				$results = $this->field_repository->fetch_all_field_values( null, $field_id);
+				$results = $this->metadatum_repository->fetch_all_metadatum_values( null, $metadatum_id);
 			}
 
 			return new \WP_REST_Response($results, 200);
 		}
 
-		$result = $this->field_repository->fetch($field_id, 'OBJECT');
+		$result = $this->metadatum_repository->fetch($metadatum_id, 'OBJECT');
 
 		return new \WP_REST_Response($this->prepare_item_for_response($result, $request), 200);
 	}
@@ -172,11 +172,11 @@ class REST_Fields_Controller extends REST_Controller {
 
 				return true;
 			}
-		} elseif($request['field_id']) {
-			$field = $this->field_repository->fetch($request['field_id']);
+		} elseif($request['metadatum_id']) {
+			$metadatum = $this->metadatum_repository->fetch($request['metadatum_id']);
 
-			if ( $field instanceof Entities\Field ) {
-				if ( $request['context'] === 'edit' && ! $field->can_read() ) {
+			if ( $metadatum instanceof Entities\Metadatum ) {
+				if ( $request['context'] === 'edit' && ! $metadatum->can_read() ) {
 					return false;
 				}
 
@@ -196,22 +196,22 @@ class REST_Fields_Controller extends REST_Controller {
 	 * @throws \Exception
 	 */
 	public function prepare_item_for_database( $request, $collection_id = null ) {
-		$field = new Entities\Field();
+		$metadatum = new Entities\Metadatum();
 
 		$meta = json_decode( $request, true );
 		foreach ( $meta as $key => $value ) {
 			$set_ = 'set_' . $key;
-			$field->$set_( $value );
+			$metadatum->$set_( $value );
 		}
 
 		if($collection_id) {
 			$collection = new Entities\Collection( $collection_id );
-			$field->set_collection( $collection );
+			$metadatum->set_collection( $collection );
 		} else {
-			$field->set_collection_id( 'default' );
+			$metadatum->set_collection_id( 'default' );
 		}
 
-		return $field;
+		return $metadatum;
 	}
 
 	/**
@@ -231,16 +231,16 @@ class REST_Fields_Controller extends REST_Controller {
 			}
 
 			if($prepared->validate()) {
-				$field = $this->field_repository->insert( $prepared);
+				$metadatum = $this->metadatum_repository->insert( $prepared);
 
-				$response = $this->prepare_item_for_response($field, $request);
+				$response = $this->prepare_item_for_response($metadatum, $request);
 
 				return new \WP_REST_Response($response, 201);
 			} else {
 				return new \WP_REST_Response([
 					'error_message' => __('One or more values are invalid.', 'tainacan'),
 					'errors'        => $prepared->get_errors(),
-					'field'         => $this->prepare_item_for_response($prepared, $request),
+					'metadatum'         => $this->prepare_item_for_response($prepared, $request),
 				], 400);
 			}
 		} elseif (!empty($request->get_body())) {
@@ -251,16 +251,16 @@ class REST_Fields_Controller extends REST_Controller {
 			}
 
 			if ( $prepared->validate() ) {
-				$field = $this->field_repository->insert( $prepared );
+				$metadatum = $this->metadatum_repository->insert( $prepared );
 
-				$response = $this->prepare_item_for_response($field, $request);
+				$response = $this->prepare_item_for_response($metadatum, $request);
 
 				return new \WP_REST_Response($response, 201);
 			} else {
 				return new \WP_REST_Response([
 					'error_message' => __('One or more values are invalid.', 'tainacan'),
 					'errors'        => $prepared->get_errors(),
-					'field'         => $this->prepare_item_for_response($prepared, $request),
+					'metadatum'         => $this->prepare_item_for_response($prepared, $request),
 				], 400);
 			}
 
@@ -284,7 +284,7 @@ class REST_Fields_Controller extends REST_Controller {
 			return $this->collection_repository->can_edit( new Entities\Collection() );
 		}
 
-		return $this->field_repository->can_edit(new Entities\Field());
+		return $this->metadatum_repository->can_edit(new Entities\Metadatum());
 	}
 
 	/**
@@ -297,12 +297,12 @@ class REST_Fields_Controller extends REST_Controller {
 		if(!empty($item)){
 			$item_arr = $item->_toArray();
 			
-			$item_arr['field_type_object'] = $item->get_field_type_object()->_toArray();
+			$item_arr['metadatum_type_object'] = $item->get_metadatum_type_object()->_toArray();
 			
 			if($request['context'] === 'edit'){
 				$item_arr['current_user_can_edit'] = $item->can_edit();
 				ob_start();
-				$item->get_field_type_object()->form();
+				$item->get_metadatum_type_object()->form();
 				$form = ob_get_clean();
 				$item_arr['edit_form'] = $form;
 				$item_arr['enabled'] = $item->get_enabled_for_collection();
@@ -332,7 +332,7 @@ class REST_Fields_Controller extends REST_Controller {
 
 			$collection = new Entities\Collection( $collection_id );
 
-			$result = $this->field_repository->fetch_by_collection( $collection, $args, 'OBJECT' );
+			$result = $this->metadatum_repository->fetch_by_collection( $collection, $args, 'OBJECT' );
 		} else {
 			$args = [
 				'meta_query' => [
@@ -344,7 +344,7 @@ class REST_Fields_Controller extends REST_Controller {
 				]
 			];
 
-			$result = $this->field_repository->fetch( $args, 'OBJECT' );
+			$result = $this->metadatum_repository->fetch( $args, 'OBJECT' );
 		}
 
 		$prepared_item = [];
@@ -362,7 +362,7 @@ class REST_Fields_Controller extends REST_Controller {
 	 * @throws \Exception
 	 */
 	public function get_items_permissions_check( $request ) {
-		if ( 'edit' === $request['context'] && ! current_user_can('edit_tainacan-fields') ) {
+		if ( 'edit' === $request['context'] && ! current_user_can('edit_tainacan-metadata') ) {
 			return false;
 		}
 
@@ -375,11 +375,11 @@ class REST_Fields_Controller extends REST_Controller {
 	 * @return \WP_Error|\WP_REST_Response
 	 */
 	public function delete_item( $request ) {
-		$field_id = $request['field_id'];
+		$metadatum_id = $request['metadatum_id'];
 
-		$field_trashed = $this->field_repository->delete($field_id);
+		$metadatum_trashed = $this->metadatum_repository->delete($metadatum_id);
 
-		$prepared = $this->prepare_item_for_response($field_trashed, $request);
+		$prepared = $this->prepare_item_for_response($metadatum_trashed, $request);
 
 		return new \WP_REST_Response($prepared, 200);
 	}
@@ -399,7 +399,7 @@ class REST_Fields_Controller extends REST_Controller {
 			}
 		}
 
-		return $this->field_repository->can_edit(new Entities\Field());
+		return $this->metadatum_repository->can_edit(new Entities\Metadatum());
 	}
 
 	/**
@@ -414,39 +414,39 @@ class REST_Fields_Controller extends REST_Controller {
 		if(!empty($body)){
 			$attributes = [];
 
-			$field_id = $request['field_id'];
+			$metadatum_id = $request['metadatum_id'];
 
 			foreach ($body as $att => $value){
 				$attributes[$att] = $value;
 			}
 
-			$field = $this->field_repository->fetch($field_id);
+			$metadatum = $this->metadatum_repository->fetch($metadatum_id);
 
 			$error_message = __('Metadata with this ID was not found', 'tainacan');
 
-			if($field){
+			if($metadatum){
 
 				// These conditions are for verify if endpoints are used correctly
-				if(!$collection_id && $field->get_collection_id() !== 'default') {
+				if(!$collection_id && $metadatum->get_collection_id() !== 'default') {
 					$error_message = __('This metadata is not a default metadata', 'tainacan');
 
 					return new \WP_REST_Response( [
 						'error_message' => $error_message,
-						'field_id'      => $field_id
+						'metadatum_id'      => $metadatum_id
 					] );
-				} elseif ($collection_id && $field->get_collection_id() === 'default'){
+				} elseif ($collection_id && $metadatum->get_collection_id() === 'default'){
 					$error_message = __('This metadata is not a collection metadata', 'tainacan');
 
 					return new \WP_REST_Response( [
 						'error_message' => $error_message,
-						'field_id'      => $field_id
+						'metadatum_id'      => $metadatum_id
 					] );
 				}
 
-				$prepared_metadata = $this->prepare_item_for_updating($field, $attributes);
+				$prepared_metadata = $this->prepare_item_for_updating($metadatum, $attributes);
 
 				if($prepared_metadata->validate()){
-					$updated_metadata = $this->field_repository->update($prepared_metadata);
+					$updated_metadata = $this->metadatum_repository->update($prepared_metadata);
 
 					$response = $this->prepare_item_for_response($updated_metadata, $request);
 
@@ -456,13 +456,13 @@ class REST_Fields_Controller extends REST_Controller {
 				return new \WP_REST_Response([
 					'error_message' => __('One or more values are invalid.', 'tainacan'),
 					'errors'        => $prepared_metadata->get_errors(),
-					'metadata'      => $this->prepare_item_for_response($prepared_metadata, $request)
+					'metadatum'      => $this->prepare_item_for_response($prepared_metadata, $request)
 				], 400);
 			}
 
 			return new \WP_REST_Response( [
 				'error_message' => $error_message,
-				'field_id'      => $field_id
+				'metadatum_id'  => $metadatum_id
 			] );
 		}
 
@@ -488,7 +488,7 @@ class REST_Fields_Controller extends REST_Controller {
 
         }
 
-        return $this->field_repository->can_edit(new Entities\Field());
+        return $this->metadatum_repository->can_edit(new Entities\Metadatum());
 	}
 
 	/**
@@ -499,7 +499,7 @@ class REST_Fields_Controller extends REST_Controller {
 	public function get_collection_params( $object_name = null ) {
 		$query_params['context']['default'] = 'view';
 
-		$query_params = array_merge($query_params, parent::get_collection_params('field'));
+		$query_params = array_merge($query_params, parent::get_collection_params('metadatum'));
 
 		$query_params['name'] = array(
 			'description' => __('Limits the result set to metadata with a specific name'),
@@ -523,7 +523,7 @@ class REST_Fields_Controller extends REST_Controller {
 			$endpoint_args['fetch'] = [
 				'type'        => 'string',
 				'description' => __('Fetch all content of a metadata within a collection'),
-				'enum'        => ['all_field_values']
+				'enum'        => ['all_metadatum_values']
 			];
 			$endpoint_args['context'] = array(
 				'type'    => 'string',
@@ -531,13 +531,13 @@ class REST_Fields_Controller extends REST_Controller {
 				'items'   => array( 'view, edit' )
 			);
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
-			$map = $this->field_repository->get_map();
+			$map = $this->metadatum_repository->get_map();
 
 			foreach ($map as $mapped => $value){
 				$set_ = 'set_'. $mapped;
 
 				// Show only args that has a method set
-				if( !method_exists(new Entities\Field(), "$set_") ){
+				if( !method_exists(new Entities\Metadatum(), "$set_") ){
 					unset($map[$mapped]);
 				}
 			}
diff --git a/src/api/endpoints/class-tainacan-rest-field-mappers-controller.php b/src/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php
similarity index 72%
rename from src/api/endpoints/class-tainacan-rest-field-mappers-controller.php
rename to src/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php
index cbf3c8076..ff7774fda 100644
--- a/src/api/endpoints/class-tainacan-rest-field-mappers-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php
@@ -4,13 +4,13 @@ namespace Tainacan\API\EndPoints;
 
 use \Tainacan\API\REST_Controller;
 
-class REST_Field_Mappers_Controller extends REST_Controller {
+class REST_Metadatum_Mappers_Controller extends REST_Controller {
 
 	/**
-	 * REST_Field_Mappers_Controller constructor.
+	 * REST_Metadatum_Mappers_Controller constructor.
 	 */
 	public function __construct() {
-		$this->rest_base = 'field-mappers';
+		$this->rest_base = 'metadatum-mappers';
 		parent::__construct();
 	}
 
@@ -34,9 +34,9 @@ class REST_Field_Mappers_Controller extends REST_Controller {
 	 */
 	public function prepare_item_for_response( $mapper, $request ) {
 
-	    $field_arr = $mapper->_toArray();
+	    $metadatum_arr = $mapper->_toArray();
 
-		return $field_arr;
+		return $metadatum_arr;
 	}
 
 	/**
@@ -47,11 +47,11 @@ class REST_Field_Mappers_Controller extends REST_Controller {
 	public function get_items( $request ) {
 		$Tainacan_Exposers = \Tainacan\Exposers\Exposers::get_instance();
 
-		$field_mappers = $Tainacan_Exposers->get_mappers( 'OBJECT' );
+		$metadatum_mappers = $Tainacan_Exposers->get_mappers( 'OBJECT' );
 
 		$prepared = [];
-		foreach ($field_mappers as $field_mapper){
-			array_push($prepared, $this->prepare_item_for_response($field_mapper, $request));
+		foreach ($metadatum_mappers as $metadatum_mapper){
+			array_push($prepared, $this->prepare_item_for_response($metadatum_mapper, $request));
 		}
 
 		return new \WP_REST_Response($prepared, 200);
diff --git a/src/api/endpoints/class-tainacan-rest-field-types-controller.php b/src/api/endpoints/class-tainacan-rest-metadatum-types-controller.php
similarity index 73%
rename from src/api/endpoints/class-tainacan-rest-field-types-controller.php
rename to src/api/endpoints/class-tainacan-rest-metadatum-types-controller.php
index f685757f4..bb99f7e55 100644
--- a/src/api/endpoints/class-tainacan-rest-field-types-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-metadatum-types-controller.php
@@ -4,13 +4,13 @@ namespace Tainacan\API\EndPoints;
 
 use \Tainacan\API\REST_Controller;
 
-class REST_Field_Types_Controller extends REST_Controller {
+class REST_Metadatum_Types_Controller extends REST_Controller {
 
 	/**
-	 * REST_Field_Types_Controller constructor.
+	 * REST_Metadatum_Types_Controller constructor.
 	 */
 	public function __construct() {
-		$this->rest_base = 'field-types';
+		$this->rest_base = 'metadatum-types';
 		parent::__construct();
 	}
 
@@ -22,7 +22,7 @@ class REST_Field_Types_Controller extends REST_Controller {
 					'callback'            => array($this, 'get_items'),
 					'permission_callback' => array($this, 'get_items_permissions_check'),
 					'args'                => [
-						'field-type' => [
+						'metadatum-type' => [
 							'description' => __('The structure of objects returned.'),
 							'items'       => [
 								'errors'              => [
@@ -67,13 +67,13 @@ class REST_Field_Types_Controller extends REST_Controller {
 	 * @return mixed|\WP_Error|\WP_REST_Response
 	 */
 	public function prepare_item_for_response( $item, $request ) {
-		$name = "\Tainacan\Field_Types\\$item";
-		$field_type = new $name();
+		$name = "\Tainacan\Metadatum_Types\\$item";
+		$metadatum_type = new $name();
 
-		$field_arr = $field_type->_toArray();
-		$field_arr['name'] = $item;
+		$metadatum_arr = $metadatum_type->_toArray();
+		$metadatum_arr['name'] = $item;
 
-		return $field_arr;
+		return $metadatum_arr;
 	}
 
 	/**
@@ -82,13 +82,13 @@ class REST_Field_Types_Controller extends REST_Controller {
 	 * @return \WP_Error|\WP_REST_Response
 	 */
 	public function get_items( $request ) {
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
-		$field_types = $Tainacan_Fields->fetch_field_types('NAME');
+		$metadatum_types = $Tainacan_Metadata->fetch_metadatum_types('NAME');
 
 		$prepared = [];
-		foreach ($field_types as $field_type){
-			array_push($prepared, $this->prepare_item_for_response($field_type, $request));
+		foreach ($metadatum_types as $metadatum_type){
+			array_push($prepared, $this->prepare_item_for_response($metadatum_type, $request));
 		}
 
 		return new \WP_REST_Response($prepared, 200);
diff --git a/src/api/tainacan-rest-creator.php b/src/api/tainacan-rest-creator.php
index f69cb3583..42dbf4725 100644
--- a/src/api/tainacan-rest-creator.php
+++ b/src/api/tainacan-rest-creator.php
@@ -1,20 +1,20 @@
 <?php
 
-const TAINACAN_REST_NAMESPACE  = 'tainacan/v2';
+const TAINACAN_REST_NAMESPACE = 'tainacan/v2';
 
 //$rest_controller               = new \Tainacan\API\REST_Controller();
-$rest_collections_controller   = new \Tainacan\API\EndPoints\REST_Collections_Controller();
-$rest_items_controller         = new \Tainacan\API\EndPoints\REST_Items_Controller();
-$rest_fields_controller        = new \Tainacan\API\EndPoints\REST_Fields_Controller();
-$rest_taxonomies_controller    = new \Tainacan\API\EndPoints\REST_Taxonomies_Controller();
-$rest_terms_controller         = new \Tainacan\API\EndPoints\REST_Terms_Controller();
-$rest_filters_controller       = new \Tainacan\API\EndPoints\REST_Filters_Controller();
-$rest_item_metadata_controller = new \Tainacan\API\EndPoints\REST_Item_Metadata_Controller();
-$rest_logs_controller          = new \Tainacan\API\EndPoints\REST_Logs_Controller();
-$rest_field_types_controller   = new \Tainacan\API\EndPoints\REST_Field_Types_Controller();
-$rest_filter_types_controller  = new \Tainacan\API\EndPoints\REST_Filter_Types_Controller();
+$rest_collections_controller     = new \Tainacan\API\EndPoints\REST_Collections_Controller();
+$rest_items_controller           = new \Tainacan\API\EndPoints\REST_Items_Controller();
+$rest_metadata_controller        = new \Tainacan\API\EndPoints\REST_Metadata_Controller();
+$rest_taxonomies_controller      = new \Tainacan\API\EndPoints\REST_Taxonomies_Controller();
+$rest_terms_controller           = new \Tainacan\API\EndPoints\REST_Terms_Controller();
+$rest_filters_controller         = new \Tainacan\API\EndPoints\REST_Filters_Controller();
+$rest_item_metadata_controller   = new \Tainacan\API\EndPoints\REST_Item_Metadata_Controller();
+$rest_logs_controller            = new \Tainacan\API\EndPoints\REST_Logs_Controller();
+$rest_metadatum_types_controller = new \Tainacan\API\EndPoints\REST_Metadatum_Types_Controller();
+$rest_filter_types_controller    = new \Tainacan\API\EndPoints\REST_Filter_Types_Controller();
 new \Tainacan\API\EndPoints\REST_Export_Controller();
-new \Tainacan\API\EndPoints\REST_Field_Mappers_Controller();
+new \Tainacan\API\EndPoints\REST_Metadatum_Mappers_Controller();
 // Add here other endpoints imports
 
 ?>
\ No newline at end of file
diff --git a/src/classes/class-tainacan-capabilities.php b/src/classes/class-tainacan-capabilities.php
index f9ae0dcd4..92462c568 100644
--- a/src/classes/class-tainacan-capabilities.php
+++ b/src/classes/class-tainacan-capabilities.php
@@ -47,7 +47,7 @@ class Capabilities {
 				"read"
 			]
 		],
-		"tainacan-field"=> [
+		"tainacan-metadatum"=> [
 			"administrator"=> [
 				"delete_posts",
 				"delete_private_posts",
diff --git a/src/classes/entities/class-tainacan-collection.php b/src/classes/entities/class-tainacan-collection.php
index 42f7c7e45..fe1d97d68 100644
--- a/src/classes/entities/class-tainacan-collection.php
+++ b/src/classes/entities/class-tainacan-collection.php
@@ -27,7 +27,7 @@ class Collection extends Entity {
         $columns,
 		$default_view_mode,
 		$enabled_view_modes,
-        $fields_order,
+        $metadata_order,
         $filters_order,
         $enable_cover_page,
         $cover_page_id,
@@ -342,8 +342,8 @@ class Collection extends Entity {
 	 *
 	 * @return string
 	 */
-	function get_default_displayed_fields() {
-		return $this->get_mapped_property( 'default_displayed_fields' );
+	function get_default_displayed_metadata() {
+		return $this->get_mapped_property( 'default_displayed_metadata' );
 	}
 
 	/**
@@ -365,12 +365,12 @@ class Collection extends Entity {
 	}
 
 	/**
-	 * Get collection fields ordination
+	 * Get collection metadata ordination
 	 *
 	 * @return string
 	 */
-	function get_fields_order() {
-		return $this->get_mapped_property( 'fields_order' );
+	function get_metadata_order() {
+		return $this->get_mapped_property( 'metadata_order' );
 	}
 	
 	/**
@@ -439,34 +439,34 @@ class Collection extends Entity {
 	}
 
 	/**
-	 * Get collection field.
+	 * Get collection metadatum.
 	 *
-	 * Returns an array of \Entity\Field objects, representing all the field of the collection.
+	 * Returns an array of \Entity\Metadatum objects, representing all the metadatum of the collection.
 	 *
-	 * @see \Tainacan\Repositories\Fields->fetch()
+	 * @see \Tainacan\Repositories\Metadata->fetch()
 	 *
-	 * @return [\Tainacan\Entities\Field] array
+	 * @return [\Tainacan\Entities\Metadatum] array
 	 * @throws \Exception
 	 */
-	function get_fields() {
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+	function get_metadata() {
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
-		return $Tainacan_Fields->fetch_by_collection( $this, [], 'OBJECT' );
+		return $Tainacan_Metadata->fetch_by_collection( $this, [], 'OBJECT' );
 	}
 
 	/**
-	 * Get the two core fields of the collection (title and description)
+	 * Get the two core metadata of the collection (title and description)
 	 * 
-	 * @return array[\Tainacan\Entities\Field]
+	 * @return array[\Tainacan\Entities\Metadatum]
 	 */
-	function get_core_fields() {
-		$repo = \Tainacan\Repositories\Fields::get_instance();
+	function get_core_metadata() {
+		$repo = \Tainacan\Repositories\Metadata::get_instance();
 
 		return $repo->fetch_by_collection($this, [
 			'meta_query' => [
 				[
-					'key' => 'field_type',
-					'value' => ['Tainacan\Field_Types\Core_Title', 'Tainacan\Field_Types\Core_Description'],
+					'key' => 'metadatum_type',
+					'value' => ['Tainacan\Metadatum_Types\Core_Title', 'Tainacan\Metadatum_Types\Core_Description'],
 					'compare' => 'IN'
 				]
 			]
@@ -474,48 +474,48 @@ class Collection extends Entity {
 	}
 
 	/**
-	 * Get the Core Title Field for this collection
+	 * Get the Core Title Metadatum for this collection
 	 * 
-	 * @return \Tainacan\Entities\Field The Core Title Field
+	 * @return \Tainacan\Entities\Metadatum The Core Title Metadatum
 	 */
-	function get_core_title_field() {
-		$repo = \Tainacan\Repositories\Fields::get_instance();
+	function get_core_title_metadatum() {
+		$repo = \Tainacan\Repositories\Metadata::get_instance();
 
 		$results = $repo->fetch_by_collection($this, [
 			'meta_query' => [
 				[
-					'key' => 'field_type',
-					'value' => 'Tainacan\Field_Types\Core_Title',
+					'key' => 'metadatum_type',
+					'value' => 'Tainacan\Metadatum_Types\Core_Title',
 				]
 			],
 			'posts_per_page' => 1
 		], 'OBJECT');
 
-		if (is_array($results) && sizeof($results) == 1 && $results[0] instanceof \Tainacan\Entities\Field) {
+		if (is_array($results) && sizeof($results) == 1 && $results[0] instanceof \Tainacan\Entities\Metadatum) {
 			return $results[0];
 		}
 		return false;
 	}
 
 	/**
-	 * Get the Core Description Field for this collection
+	 * Get the Core Description Metadatum for this collection
 	 * 
-	 * @return \Tainacan\Entities\Field The Core Description Field
+	 * @return \Tainacan\Entities\Metadatum The Core Description Metadatum
 	 */
-	function get_core_description_field() {
-		$repo = \Tainacan\Repositories\Fields::get_instance();
+	function get_core_description_metadatum() {
+		$repo = \Tainacan\Repositories\Metadata::get_instance();
 
 		$results = $repo->fetch_by_collection($this, [
 			'meta_query' => [
 				[
-					'key' => 'field_type',
-					'value' => 'Tainacan\Field_Types\Core_Description',
+					'key' => 'metadatum_type',
+					'value' => 'Tainacan\Metadatum_Types\Core_Description',
 				]
 			],
 			'posts_per_page' => 1
 		], 'OBJECT');
 
-		if (is_array($results) && sizeof($results) == 1 && $results[0] instanceof \Tainacan\Entities\Field) {
+		if (is_array($results) && sizeof($results) == 1 && $results[0] instanceof \Tainacan\Entities\Metadatum) {
 			return $results[0];
 		}
 		return false;
@@ -611,8 +611,8 @@ class Collection extends Entity {
 	 *
 	 * @return void
 	 */
-	function set_default_displayed_fields( $value ) {
-		$this->set_mapped_property( 'default_displayed_fields', $value );
+	function set_default_displayed_metadata( $value ) {
+		$this->set_mapped_property( 'default_displayed_metadata', $value );
 	}
 
 	/**
@@ -638,14 +638,14 @@ class Collection extends Entity {
 	}
 
 	/**
-	 * Set collection fields ordination
+	 * Set collection metadata ordination
 	 *
 	 * @param [string] $value
 	 *
 	 * @return void
 	 */
-	function set_fields_order( $value ) {
-		$this->set_mapped_property( 'fields_order', $value );
+	function set_metadata_order( $value ) {
+		$this->set_mapped_property( 'metadata_order', $value );
 	}
 
 	/**
diff --git a/src/classes/entities/class-tainacan-filter.php b/src/classes/entities/class-tainacan-filter.php
index 2a5adca48..aeeb00566 100644
--- a/src/classes/entities/class-tainacan-filter.php
+++ b/src/classes/entities/class-tainacan-filter.php
@@ -15,7 +15,7 @@ class Filter extends Entity {
         $description,
         $order,
         $color,
-        $field,
+        $metadatum,
         $filter_type,
         $filter_type_options;
 
@@ -39,11 +39,11 @@ class Filter extends Entity {
 	 */
 	public function _toArray(){
 		$filter_array = parent::_toArray();
-		$field_id = $filter_array['field'];
+		$metadatum_id = $filter_array['metadatum'];
 
-		$filter_array['field'] = [];
-		$filter_array['field']['field_id'] = $field_id;
-		$filter_array['field']['field_name'] = $this->get_field()->get_name();
+		$filter_array['metadatum'] = [];
+		$filter_array['metadatum']['metadatum_id'] = $metadatum_id;
+		$filter_array['metadatum']['metadatum_name'] = $this->get_metadatum()->get_name();
 
 		return $filter_array;
 	}
@@ -83,14 +83,14 @@ class Filter extends Entity {
     }
 
 	/**
-	 * Return the field
+	 * Return the metadatum
 	 *
-	 * @return Field
+	 * @return Metadatum
 	 * @throws \Exception
 	 */
-    function get_field() {
-        $id = $this->get_mapped_property('field');
-        return new Field( $id );
+    function get_metadatum() {
+        $id = $this->get_mapped_property('metadatum');
+        return new Metadatum( $id );
     }
 
     /**
@@ -169,15 +169,15 @@ class Filter extends Entity {
     }
 
     /**
-     * Define the filter field
+     * Define the filter metadatum
      * 
-     * @param \Tainacan\Entities\Field
+     * @param \Tainacan\Entities\Metadatum
      * @return void
      */
-    function set_field( $value ){
-    	$id = ( $value instanceof Field ) ? $value->get_id() : $value;
+    function set_metadatum( $value ){
+    	$id = ( $value instanceof Metadatum ) ? $value->get_id() : $value;
 
-        $this->set_mapped_property('field', $id);
+        $this->set_mapped_property('metadatum', $id);
     }
 
     /**
@@ -193,7 +193,7 @@ class Filter extends Entity {
 	/**
 	 * Transient property used to store the status of the filter for a particular collection
 	 *
-	 * Used by the API to tell front end when a field is disabled
+	 * Used by the API to tell front end when a metadatum is disabled
 	 *
 	 */
 	public function get_enabled_for_collection() {
@@ -207,7 +207,7 @@ class Filter extends Entity {
 	/**
 	 * {@inheritdoc }
 	 *
-	 * Also validates the field, calling the validate_options callback of the Field Type
+	 * Also validates the metadatum, calling the validate_options callback of the Metadatum Type
 	 *
 	 * @return bool valid or not
 	 * @throws \Exception
@@ -228,11 +228,11 @@ class Filter extends Entity {
         }
 
         if (!is_array($is_valid)) {
-	        throw new \Exception( "Return of validate_options field type method should be an Array in case of error" );
+	        throw new \Exception( "Return of validate_options metadatum type method should be an Array in case of error" );
         }
 
-        foreach ($is_valid as $field => $message) {
-            $this->add_error($field, $message);
+        foreach ($is_valid as $metadatum => $message) {
+            $this->add_error($metadatum, $message);
         }
 
         return false;
diff --git a/src/classes/entities/class-tainacan-item-metadata-entity.php b/src/classes/entities/class-tainacan-item-metadata-entity.php
index a66d18552..bef495fc6 100644
--- a/src/classes/entities/class-tainacan-item-metadata-entity.php
+++ b/src/classes/entities/class-tainacan-item-metadata-entity.php
@@ -5,7 +5,7 @@ namespace Tainacan\Entities;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Represents the Item Field Entity
+ * Represents the Item Metadatum Entity
  */
 class Item_Metadata_Entity extends Entity {
 	protected static $post_type = false;
@@ -18,7 +18,7 @@ class Item_Metadata_Entity extends Entity {
 	
 	protected
         $item,
-		$field,
+		$metadatum,
 		$parent_meta_id,
 		$meta_id,
 		$has_value,
@@ -27,13 +27,13 @@ class Item_Metadata_Entity extends Entity {
 	/**
 	 * 
 	 * @param Item   $item    Item Entity
-	 * @param Field  $field   Field Entity
+	 * @param Metadatum  $metadatum   Metadatum Entity
 	 * @param int $meta_id ID for a specific meta row 
 	 */
-    function __construct(Item $item = null, Field $field = null, $meta_id = null, $parent_meta_id = null) {
+    function __construct(Item $item = null, Metadatum $metadatum = null, $meta_id = null, $parent_meta_id = null) {
         
         $this->set_item($item);
-        $this->set_field($field);
+        $this->set_metadatum($metadatum);
 		
 		if (!is_null($meta_id) && is_int($meta_id)) {
 			$this->set_meta_id($meta_id);
@@ -51,10 +51,10 @@ class Item_Metadata_Entity extends Entity {
 	 * @return string
 	 */
 	public function  get_value_as_html(){
-		$field = $this->get_field();
+		$metadatum = $this->get_metadatum();
 		
-		if (is_object($field)) {
-			$fto = $field->get_field_type_object();
+		if (is_object($metadatum)) {
+			$fto = $metadatum->get_metadatum_type_object();
 			if (is_object($fto)) {
 				
 				if ( method_exists($fto, 'get_value_as_html') ) {
@@ -143,12 +143,12 @@ class Item_Metadata_Entity extends Entity {
 		$as_array['value_as_html'] = $this->get_value_as_html();
 		$as_array['value_as_string'] = $this->get_value_as_string();
 
-		if($this->get_field()->get_field_type_object()->get_primitive_type() === 'date'){
+		if($this->get_metadatum()->get_metadatum_type_object()->get_primitive_type() === 'date'){
 			$as_array['date_i18n'] = $this->get_date_i18n($this->get_value_as_string());
 		}
 
 	    $as_array['item']  = $this->get_item()->_toArray();
-	    $as_array['field'] = $this->get_field()->_toArray();
+	    $as_array['metadatum'] = $this->get_metadatum()->_toArray();
 
 	    return $as_array;
     }
@@ -164,7 +164,7 @@ class Item_Metadata_Entity extends Entity {
     }
     
     /**
-     * Define the field value
+     * Define the metadatum value
      *
      * @param [integer | string] $value
      * @return void
@@ -174,20 +174,20 @@ class Item_Metadata_Entity extends Entity {
     }
     
     /**
-     * Define the field
+     * Define the metadatum
      *
-     * @param Field $field
+     * @param Metadatum $metadatum
      * @return void
      */
-    function set_field(Field $field = null) {
-        $this->field = $field;
+    function set_metadatum(Metadatum $metadatum = null) {
+        $this->metadatum = $metadatum;
     }
 	
 	/**
 	 * Set the specific meta ID for this metadata.
 	 *
 	 * When this value is set, get_value() will use it to fetch the value from 
-	 * the post_meta table, instead of considering the item and field IDs
+	 * the post_meta table, instead of considering the item and metadatum IDs
 	 * 
 	 * @param int $meta_id the ID of a specifica post_meta row
 	 */
@@ -195,15 +195,15 @@ class Item_Metadata_Entity extends Entity {
 		if (is_int($meta_id)) {
 			$this->meta_id = $meta_id;
 			return true;
-			// TODO: Should we check here to see if this meta_id is really from this field and item?
+			// TODO: Should we check here to see if this meta_id is really from this metadatum and item?
 		}
 		return false;
 	}
 	
 	/**
-	 * Set parent_meta_id. Used when a item_metadata is inside a compound Field 
+	 * Set parent_meta_id. Used when a item_metadata is inside a compound Metadatum 
 	 *
-	 * When you have a multiple compound field, this indicates of which instace of the value this item_metadata is attached to
+	 * When you have a multiple compound metadatum, this indicates of which instace of the value this item_metadata is attached to
 	 * 
 	 * @param [type] $parent_meta_id [description]
 	 */
@@ -211,7 +211,7 @@ class Item_Metadata_Entity extends Entity {
 		if (is_int($parent_meta_id)) {
 			$this->parent_meta_id = $parent_meta_id;
 			return true;
-			// TODO: Should we check here to see if this meta_id is really from this field and item?
+			// TODO: Should we check here to see if this meta_id is really from this metadatum and item?
 		}
 		return false;
 	}
@@ -226,18 +226,18 @@ class Item_Metadata_Entity extends Entity {
     }
     
     /**
-     * Return the field
+     * Return the metadatum
      *
-     * @return Field
+     * @return Metadatum
      */
-    function get_field() {
-        return $this->field;
+    function get_metadatum() {
+        return $this->metadatum;
     }
 	
 	/**
      * Return the meta_id
      *
-     * @return Field
+     * @return Metadatum
      */
     function get_meta_id() {
         return isset($this->meta_id) ? $this->meta_id : null;
@@ -246,14 +246,14 @@ class Item_Metadata_Entity extends Entity {
 	/**
      * Return the meta_id
      *
-     * @return Field
+     * @return Metadatum
      */
     function get_parent_meta_id() {
         return isset($this->parent_meta_id) ? $this->parent_meta_id : 0;
     }
     
     /**
-     * Return the field value
+     * Return the metadatum value
      *
      * @return string | integer
      */
@@ -280,30 +280,30 @@ class Item_Metadata_Entity extends Entity {
     }
     
     /**
-     * Return true if field is multiple, else return false
+     * Return true if metadatum is multiple, else return false
      *
      * @return boolean
      */
     function is_multiple() {
-        return $this->get_field()->is_multiple();
+        return $this->get_metadatum()->is_multiple();
     }
     
     /**
-     * Return true if field is key
+     * Return true if metadatum is key
      *
      * @return boolean
      */
     function is_collection_key() {
-        return $this->get_field()->is_collection_key();
+        return $this->get_metadatum()->is_collection_key();
     }
     
     /**
-     * Return true if field is required
+     * Return true if metadatum is required
      *
      * @return boolean
      */
     function is_required() {
-        return $this->get_field()->is_required();
+        return $this->get_metadatum()->is_required();
     }
     
     /**
@@ -313,19 +313,19 @@ class Item_Metadata_Entity extends Entity {
      */
     function validate() {   
         $value = $this->get_value();
-        $field = $this->get_field();
+        $metadatum = $this->get_metadatum();
         $item = $this->get_item();
         
         if (empty($value) && $this->is_required()) {
-            $this->add_error('required', $field->get_name() . ' is required');
+            $this->add_error('required', $metadatum->get_name() . ' is required');
             return false;
         }
 
-        $classFieldType = $field->get_field_type_object();
-        if( is_object( $classFieldType ) ){
-            if( method_exists ( $classFieldType , 'validate' ) ){
-                if( ! $classFieldType->validate( $this ) ) {
-                    $this->add_error('field_type_error', $classFieldType->get_errors() );
+        $classMetadatumType = $metadatum->get_metadatum_type_object();
+        if( is_object( $classMetadatumType ) ){
+            if( method_exists ( $classMetadatumType , 'validate' ) ){
+                if( ! $classMetadatumType->validate( $this ) ) {
+                    $this->add_error('metadatum_type_error', $classMetadatumType->get_errors() );
                     return false;
                 }
             }
@@ -344,25 +344,25 @@ class Item_Metadata_Entity extends Entity {
                 }
                 
                 if ($this->is_required() && !$one_filled) {
-                    $this->add_error('required', $field->get_name() . ' is required');
+                    $this->add_error('required', $metadatum->get_name() . ' is required');
                     return false;
                 }
                 
                 if (!$valid) {
-                    $this->add_error('invalid', $field->get_name() . ' is invalid');
+                    $this->add_error('invalid', $metadatum->get_name() . ' is invalid');
                     return false;
                 }
                 
                 $this->set_as_valid();
                 return true;   
             } else {
-                $this->add_error('invalid', $field->get_name() . ' is invalid');
+                $this->add_error('invalid', $metadatum->get_name() . ' is invalid');
                 return false;
             }
         } else {
 
             if( is_array($value) ){
-				$this->add_error('not_multiple', $field->get_name() . ' do not accept array as value');
+				$this->add_error('not_multiple', $metadatum->get_name() . ' do not accept array as value');
                 return false;
             }
             
@@ -372,7 +372,7 @@ class Item_Metadata_Entity extends Entity {
                 $test = $Tainacan_Items->fetch([
                     'meta_query' => [
                         [
-                            'key'   => $this->field->get_id(),
+                            'key'   => $this->metadatum->get_id(),
                             'value' => $value
                         ],
                     ],
@@ -380,7 +380,7 @@ class Item_Metadata_Entity extends Entity {
                 ], $item->get_collection());
 
                 if ($test->have_posts()) {
-                    $this->add_error('key_exists', $field->get_name() . ' is a collection key and there is another item with the same value');
+                    $this->add_error('key_exists', $metadatum->get_name() . ' is a collection key and there is another item with the same value');
                     return false;
                 }
             }
diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php
index 3d999f9af..a9b97253f 100644
--- a/src/classes/entities/class-tainacan-item.php
+++ b/src/classes/entities/class-tainacan-item.php
@@ -336,13 +336,13 @@ class Item extends Entity {
 	/**
 	 * Return a List of ItemMetadata objects
 	 *
-	 * It will return all fields associeated with the collection this item is part of.
+	 * It will return all metadata associeated with the collection this item is part of.
 	 *
-	 * If the item already has a value for any of the fields, it will be available.
+	 * If the item already has a value for any of the metadata, it will be available.
 	 *
 	 * @return array Array of ItemMetadata objects
 	 */
-	function get_fields($args = []) {
+	function get_metadata($args = []) {
 		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
 		return $Tainacan_Item_Metadata->fetch( $this, 'OBJECT', $args );
@@ -380,18 +380,18 @@ class Item extends Entity {
 			$is_valid = false;
 		}
 
-		$arrayItemMetadata = $this->get_fields();
+		$arrayItemMetadata = $this->get_metadata();
 		if ( $arrayItemMetadata ) {
 			foreach ( $arrayItemMetadata as $itemMetadata ) {
 				
-				// skip validation for Compound Fields
-				if ( $itemMetadata->get_field()->get_field_type() == 'Tainacan\Field_Types\Compound' ) {
+				// skip validation for Compound Metadata
+				if ( $itemMetadata->get_metadatum()->get_metadatum_type() == 'Tainacan\Metadatum_Types\Compound' ) {
 					continue;
 				}
 
 				if ( ! $itemMetadata->validate() ) {
 					$errors = $itemMetadata->get_errors();
-					$this->add_error( $itemMetadata->get_field()->get_id(), $errors );
+					$this->add_error( $itemMetadata->get_metadatum()->get_id(), $errors );
 					$is_valid = false;
 				}
 			}
@@ -410,7 +410,7 @@ class Item extends Entity {
 	 * {@inheritDoc}
 	 * @see \Tainacan\Entities\Entity::validate()
 	 */
-	public function validate_core_fields() {
+	public function validate_core_metadata() {
 		if ( ! in_array( $this->get_status(), apply_filters( 'tainacan-status-require-validation', [
 			'publish',
 			'future',
@@ -449,15 +449,15 @@ class Item extends Entity {
 	/**
 	 * Return the item metadata as a HTML string to be used as output.
 	 *
-	 * Each metadata is a label with the field name and the value.
+	 * Each metadata is a label with the metadatum name and the value.
 	 *
-	 * If an ID, a slug or a Tainacan\Entities\Field object is passed in the 'metadata' argument, it returns only one metadata, otherwise
+	 * If an ID, a slug or a Tainacan\Entities\Metadatum object is passed in the 'metadata' argument, it returns only one metadata, otherwise
 	 * it returns all metadata
 	 *
 	 * @param array|string $args {
 	 *     Optional. Array or string of arguments.
 	 * 
-	 * 	   @type mixed		 $metadata					Field object, ID or slug to retrieve only one field. empty returns all metadata
+	 * 	   @type mixed		 $metadata					Metadatum object, ID or slug to retrieve only one metadatum. empty returns all metadata
 	 * 
 	 *     @type array		 $metadata__in				Array of metadata IDs or Slugs to be retrieved. Default none
 	 * 
@@ -469,7 +469,7 @@ class Item extends Entity {
 	 * 
 	 *     @type bool		 $exclude_core				Exclude Core Metadata (title and description) from result. Default false
 	 * 
-	 *     @type bool        $hide_empty                Wether to hide or not fields the item has no value to
+	 *     @type bool        $hide_empty                Wether to hide or not metadata the item has no value to
 	 *                                                  Default: true
 	 *     @type string      $before_title              String to be added before each metadata title
 	 *                                                  Default '<h3>'
@@ -487,7 +487,7 @@ class Item extends Entity {
 	public function get_metadata_as_html($args = array()) {
 		
 		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 		
 		$return = '';
 		
@@ -508,33 +508,33 @@ class Item extends Entity {
 
 		if (!is_null($args['metadata'])) {
 			
-			$field_object = null;
+			$metadatum_object = null;
 			
-			if ( $field instanceof \Tainacan\Entities\Field ) {
-				$field_object = $field;
-			} elseif ( is_int($field) ) {
-				$field_object = $Tainacan_Fields->fetch($field);
-			} elseif ( is_string($field) ) {
-				$query = $Tainacan_Fields->fetch(['slug' => $field], 'OBJECT');
-				if ( is_array($query) && sizeof($query) == 1 && isset($field[0])) {
-					$field_object = $field[0];
+			if ( $metadatum instanceof \Tainacan\Entities\Metadatum ) {
+				$metadatum_object = $metadatum;
+			} elseif ( is_int($metadatum) ) {
+				$metadatum_object = $Tainacan_Metadata->fetch($metadatum);
+			} elseif ( is_string($metadatum) ) {
+				$query = $Tainacan_Metadata->fetch(['slug' => $metadatum], 'OBJECT');
+				if ( is_array($query) && sizeof($query) == 1 && isset($metadatum[0])) {
+					$metadatum_object = $metadatum[0];
 				}
 			}
 			
-			if ( $field_object instanceof \Tainacan\Entities\Field ) {
+			if ( $metadatum_object instanceof \Tainacan\Entities\Metadatum ) {
 
 				if ( is_array($args['metadata__not_in']) 
 					&& (
-						in_array($field_object->get_slug(), $args['metadata__not_in']) ||
-						in_array($field_object->get_id(), $args['metadata__not_in'])
+						in_array($metadatum_object->get_slug(), $args['metadata__not_in']) ||
+						in_array($metadatum_object->get_id(), $args['metadata__not_in'])
 					)
 				) {
 					return $return;
 				}
 
-				$item_meta = new \Tainacan\Entities\Item_Metadata_Entity($this, $field_object);
+				$item_meta = new \Tainacan\Entities\Item_Metadata_Entity($this, $metadatum_object);
 				if ($item_meta->has_value() || !$args['hide_empty']) {
-					$return .= $args['before_title'] . $field_object->get_name() . $args['after_title'];
+					$return .= $args['before_title'] . $metadatum_object->get_name() . $args['after_title'];
 					$return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value'];
 				}
 				
@@ -578,11 +578,11 @@ class Item extends Entity {
 		}
 
 		
-		$fields = $this->get_fields($query_args);
+		$metadata = $this->get_metadata($query_args);
 		
-		foreach ( $fields as $item_meta ) {
+		foreach ( $metadata as $item_meta ) {
 
-			$fto = $item_meta->get_field()->get_field_type_object();
+			$fto = $item_meta->get_metadatum()->get_metadatum_type_object();
 
 			if ( $fto->get_core() ) {
 				if ( $args['exclude_core'] ) {
@@ -595,7 +595,7 @@ class Item extends Entity {
 			}
 
 			if ($item_meta->has_value() || !$args['hide_empty']) {
-				$return .= $args['before_title'] . $item_meta->get_field()->get_name() . $args['after_title'];
+				$return .= $args['before_title'] . $item_meta->get_metadatum()->get_name() . $args['after_title'];
 				$return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value'];
 			}
 		}
diff --git a/src/classes/entities/class-tainacan-field.php b/src/classes/entities/class-tainacan-metadatum.php
similarity index 66%
rename from src/classes/entities/class-tainacan-field.php
rename to src/classes/entities/class-tainacan-metadatum.php
index 526610f74..395dafdb6 100644
--- a/src/classes/entities/class-tainacan-field.php
+++ b/src/classes/entities/class-tainacan-metadatum.php
@@ -5,9 +5,9 @@ namespace Tainacan\Entities;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Represents the Entity Field
+ * Represents the Entity Metadatum
  */
-class Field extends Entity {
+class Metadatum extends Entity {
 	protected
         $name,
         $slug,
@@ -21,21 +21,31 @@ class Field extends Entity {
         $collection_key,
         $mask,
         $default_value,
-        $field_type,
-        $field_type_options;
+        $metadatum_type,
+        $metadatum_type_options;
 
     // Collection getter and setter declared here
     use \Tainacan\Traits\Entity_Collection_Relation;
 	
 	public $enabled_for_collection = true;
 	
-	static $post_type = 'tainacan-field';
+    static $post_type = 'tainacan-metadatum';
+    
+
+    /**
+	 * {@inheritDoc}
+     * @see \Tainacan\Entities\Entity::capability_type
+	 * @var string
+	 */
+    protected static $capability_type = ['tainacan-metadatum', 'tainacan-metadata'];
+
+
 	/**
 	 * {@inheritDoc}
 	 * @see \Tainacan\Entities\Entity::repository
 	 * @var string
 	 */
-	protected $repository = 'Fields';
+	protected $repository = 'Metadata';
 	
 	public function  __toString(){
 		return 'Hello, my name is '. $this->get_name();
@@ -57,7 +67,7 @@ class Field extends Entity {
 	}
 
     /**
-     * Return the field name
+     * Return the metadatum name
      *
      * @return string
      */
@@ -66,7 +76,7 @@ class Field extends Entity {
     }
     
     /**
-     * Get field slug
+     * Get metadatum slug
      *
      * @return string
      */
@@ -75,7 +85,7 @@ class Field extends Entity {
     }
 
     /**
-     * Return the field order type
+     * Return the metadatum order type
      *
      * @return string
      */
@@ -93,7 +103,7 @@ class Field extends Entity {
     }
 
     /**
-     * Return the field description
+     * Return the metadatum description
      *
      * @return string
      */
@@ -102,7 +112,7 @@ class Field extends Entity {
     }
 
     /**
-     * Return if is a required field
+     * Return if is a required metadatum
      *
      * @return boolean
      */
@@ -111,7 +121,7 @@ class Field extends Entity {
     }
     
     /**
-     * Return if is a multiple field
+     * Return if is a multiple metadatum
      *
      * @return boolean
      */
@@ -129,7 +139,7 @@ class Field extends Entity {
     }
     
     /**
-     * Return if field is key
+     * Return if metadatum is key
      *
      * @return boolean
      */
@@ -147,7 +157,7 @@ class Field extends Entity {
     }
 
     /**
-     * Return the field default value
+     * Return the metadatum default value
      *
      * @return string || integer
      */
@@ -156,37 +166,37 @@ class Field extends Entity {
     }
 
     /**
-     * Return the an object child of \Tainacan\Field_Types\Field_Type with options
+     * Return the an object child of \Tainacan\metadatum_Types\Metadatum_Type with options
      *
-     * @return \Tainacan\Field_Types\Field_Type The field type class with filled options
+     * @return \Tainacan\Metadatum_Types\Metadatum_Type The metadatum type class with filled options
      */
-    function get_field_type_object(){
-        $class_name = $this->get_field_type();
+    function get_metadatum_type_object(){
+        $class_name = $this->get_metadatum_type();
         $object_type = new $class_name();
-        $object_type->set_options(  $this->get_field_type_options() );
+        $object_type->set_options(  $this->get_metadatum_type_options() );
     	return $object_type;
     }
 
     /**
-     * Return the class name for the field type
+     * Return the class name for the metadatum type
      *
      * @return string The
      */
-    function get_field_type(){
-    	return $this->get_mapped_property('field_type');
+    function get_metadatum_type(){
+    	return $this->get_mapped_property('metadatum_type');
     }
 
     /**
-     * Return the actual options for the current field type
+     * Return the actual options for the current metadatum type
      *
-     * @return array Configurations for the field type object
+     * @return array Configurations for the metadatum type object
      */
-    function get_field_type_options(){
-        return $this->get_mapped_property('field_type_options');
+    function get_metadatum_type_options(){
+        return $this->get_mapped_property('metadatum_type_options');
     }
 
     /**
-     * Return true if this field allow community suggestions, false otherwise
+     * Return true if this metadatum allow community suggestions, false otherwise
      * @return bool
      */
     function get_accept_suggestion() {
@@ -202,7 +212,7 @@ class Field extends Entity {
     }
 
     /**
-     * Set the field name
+     * Set the metadatum name
      *
      * @param [string] $value
      * @return void
@@ -212,9 +222,9 @@ class Field extends Entity {
     }
 
     /**
-     * Set the field slug
+     * Set the metadatum slug
      *
-     * If you dont set the field slug, it will be set automatically based on the name and
+     * If you dont set the metadatum slug, it will be set automatically based on the name and
      * following WordPress default behavior of creating slugs for posts.
      *
      * If you set the slug for an existing one, WordPress will append a number at the end of in order
@@ -228,7 +238,7 @@ class Field extends Entity {
     }
 
     /**
-     * Set manually the order of the field
+     * Set manually the order of the metadatum
      *
      * @param [string] $value
      * @return void
@@ -238,7 +248,7 @@ class Field extends Entity {
     }
 
     /**
-     * Set the field parent ID
+     * Set the metadatum parent ID
      *
      * @param [integer] $value The ID from parent
      * @return void
@@ -248,7 +258,7 @@ class Field extends Entity {
     }
 
     /**
-     * Set field description
+     * Set metadatum description
      *
      * @param [string] $value The text description
      * @return void
@@ -258,7 +268,7 @@ class Field extends Entity {
     }
 
     /**
-     * Allow the field be required
+     * Allow the metadatum be required
      *
      * @param [boolean] $value
      * @return void
@@ -268,7 +278,7 @@ class Field extends Entity {
     }
     
     /**
-     * Allow multiple fields
+     * Allow multiple metadata
      *
      * @param [boolean] $value
      * @return void
@@ -278,7 +288,7 @@ class Field extends Entity {
     }
     
     /**
-     * The number of  possible fields
+     * The number of  possible metadata
      *
      * @param [string] $value
      * @return void
@@ -298,7 +308,7 @@ class Field extends Entity {
     }
 
     /**
-     * Set mask for the field
+     * Set mask for the metadatum
      *
      * @param [string] $value
      * @return void
@@ -318,16 +328,16 @@ class Field extends Entity {
     }
 
     /**
-     * set the field type class name
+     * set the metadatum type class name
      *
-     * @param string | \Tainacan\Field_Types\Field_Type $value The name of the class or the instance
+     * @param string | \Tainacan\Metadatum_Types\Metadatum_Type $value The name of the class or the instance
      */
-    public function set_field_type( $value ){
-    	$this->set_mapped_property('field_type', ( is_object( $value ) ) ?  get_class( $value ) : $value ) ; // Encode to avoid backslaches removal
+    public function set_metadatum_type( $value ){
+    	$this->set_mapped_property('metadatum_type', ( is_object( $value ) ) ?  get_class( $value ) : $value ) ; // Encode to avoid backslaches removal
     }
     
     /**
-     * Set if this field allow community suggestions
+     * Set if this metadatum allow community suggestions
      * @param bool $value
      */
     function set_accept_suggestion( $value ) {
@@ -335,17 +345,17 @@ class Field extends Entity {
     }
     
     /**
-     * Set Field type options
+     * Set Metadatum type options
      *
      * @param [string || integer] $value
      * @return void
      */
-    function set_field_type_options( $value ){
-        $this->set_mapped_property('field_type_options', $value);
+    function set_metadatum_type_options( $value ){
+        $this->set_mapped_property('metadatum_type_options', $value);
     }
     
     /**
-     * Set exposers mapping configuration for this field
+     * Set exposers mapping configuration for this metadatum
      * @param array $value
      */
     public function set_exposer_mapping( $value ) {
@@ -354,9 +364,9 @@ class Field extends Entity {
 	
 	
 	/**
-	 * Transient property used to store the status of the field for a particular collection
+	 * Transient property used to store the status of the metadatum for a particular collection
 	 *
-	 * Used by the API to tell front end when a field is disabled
+	 * Used by the API to tell front end when a metadatum is disabled
 	 * 
 	 */
 	public function get_enabled_for_collection() {
@@ -399,7 +409,7 @@ class Field extends Entity {
 	/**
 	 * {@inheritdoc }
 	 *
-	 * Also validates the field, calling the validate_options callback of the Field Type
+	 * Also validates the metadatum, calling the validate_options callback of the Metadatum Type
 	 *
 	 * @return bool valid or not
 	 * @throws \Exception
@@ -411,28 +421,28 @@ class Field extends Entity {
         if (false === $is_valid)
             return false;
         
-		// You cant have a multiple field inside a compound field (except category)
+		// You cant have a multiple metadatum inside a compound metadatum (except category)
 		if ($this->get_parent() > 0) {
-			if ( $this->is_multiple() && $this->get_field_type_object()->get_primitive_type() != 'term') {
+			if ( $this->is_multiple() && $this->get_metadatum_type_object()->get_primitive_type() != 'term') {
 				$this->add_error($this->get_id(), __('Compound metadata do not support metadata with multiple values (except categories)', 'tainacan'));
 				return false;
 			}
 		}
 		
-		// You cant have a category field inside a multiple compound field 
-		if ( $this->get_parent() > 0 && $this->get_field_type_object()->get_primitive_type() == 'term' ) {
-			$parent_field = new \Tainacan\Entities\Field($this->get_parent());
-			if ( $parent_field->is_multiple() ) {
+		// You cant have a category metadatum inside a multiple compound metadatum
+		if ( $this->get_parent() > 0 && $this->get_metadatum_type_object()->get_primitive_type() == 'term' ) {
+			$parent_metadatum = new \Tainacan\Entities\Metadatum($this->get_parent());
+			if ( $parent_metadatum->is_multiple() ) {
 				$this->add_error($this->get_id(), __('Taxonomy metadata can not be used inside Compound metadata with multiple values', 'tainacan'));
 				return false;
 			}
 		}
-		if ( $this->get_field_type() == 'Tainacan\Field_Types\Compound' && $this->is_multiple() ) {
-			$Tainacan_fields = \Tainacan\Repositories\Fields::get_instance();
-			$children = $Tainacan_fields->fetch(
+		if ( $this->get_metadatum_type() == 'Tainacan\Metadatum_Types\Compound' && $this->is_multiple() ) {
+			$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+			$children = $Tainacan_Metadata->fetch(
 				[
 					'parent' => $this->get_id(),
-					'field_type' => 'Tainacan\Field_Types\Category',
+					'metadatum_type' => 'Tainacan\Metadatum_Types\Category',
 					'post_status' => 'any'
 				]
 				, 'OBJECT');
@@ -443,7 +453,7 @@ class Field extends Entity {
 			}
 		}
 		
-        $fto = $this->get_field_type_object();
+        $fto = $this->get_metadatum_type_object();
 
         if (is_object($fto)) {
             $is_valid = $fto->validate_options($this);
@@ -456,10 +466,10 @@ class Field extends Entity {
         }
             
         if (!is_array($is_valid)) {
-	        throw new \Exception( "Return of validate_options field type method should be an Array in case of error" );
+	        throw new \Exception( "Return of validate_options metadatum type method should be an Array in case of error" );
         }
 
-	    $this->add_error('field_type_options', $is_valid);
+	    $this->add_error('metadatum_type_options', $is_valid);
         
         return false;
             
diff --git a/src/classes/filter-types/autocomplete/Autocomplete.vue b/src/classes/filter-types/autocomplete/Autocomplete.vue
index cd74ead4b..6a1c8666d 100644
--- a/src/classes/filter-types/autocomplete/Autocomplete.vue
+++ b/src/classes/filter-types/autocomplete/Autocomplete.vue
@@ -48,21 +48,21 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
             const vm = this;
 
-            let in_route = '/collection/' + this.collection + '/fields/' +  this.field;
+            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
 
-            if(this.isRepositoryLevel){
-                in_route = '/fields/'+ this.field;
+            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
+                in_route = '/metadata/'+ this.metadatum;
             }
 
             axios.get(in_route)
                 .then( res => {
                     let result = res.data;
-                    if( result && result.field_type ){
-                        vm.field_object = result;
-                        vm.type = result.field_type;
+                    if( result && result.metadatum_type ){
+                        vm.metadatum_object = result;
+                        vm.type = result.metadatum_type;
                         vm.selectedValues();
                     }
                 })
@@ -78,7 +78,7 @@
                 isLoading: false,
                 type: '',
                 collection: '',
-                field: '',
+                metadatum: '',
                 label: ''
             }
         },
@@ -97,7 +97,7 @@
             onSelect(){
                 this.$emit('input', {
                     filter: 'autocomplete',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: this.collection,
                     value: this.results
                 });
@@ -105,13 +105,13 @@
             search( query ){
                 let promise = null;
                 this.options = [];
-                if ( this.type === 'Tainacan\\Field_Types\\Relationship' ) {
-                    let collectionTarget = ( this.field_object && this.field_object.field_type_options.collection_id ) ?
-                        this.field_object.field_type_options.collection_id : this.collection_id;
+                if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) {
+                    let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ?
+                        this.metadatum_object.metadatum_type_options.collection_id : this.collection_id;
                     promise = this.getValuesRelationship( collectionTarget );
 
                 } else {
-                    promise = this.getValuesPlainText( this.field, query, this.isRepositoryLevel );
+                    promise = this.getValuesPlainText( this.metadatum, query, this.isRepositoryLevel );
                 }
 
                 promise.then( () => {
@@ -126,14 +126,14 @@
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newField => newField.key === this.field );
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
-                    let collectionTarget = ( this.field_object && this.field_object.field_type_options.collection_id ) ?
-                        this.field_object.field_type_options.collection_id : this.collection_id;
+                    let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ?
+                        this.metadatum_object.metadatum_type_options.collection_id : this.collection_id;
 
 
-                    if ( this.type === 'Tainacan\\Field_Types\\Relationship' ) {
+                    if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) {
                         let query = qs.stringify({ postin: metadata.value  });
 
                         axios.get('/collection/' + collectionTarget + '/items?' + query)
@@ -161,7 +161,7 @@
                 this.selected = '';
                 this.$emit('input', {
                     filter: 'autocomplete',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
                     value: ''
                 });
diff --git a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
index c2d875d94..d4d266abe 100644
--- a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
+++ b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
@@ -4,7 +4,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class Autocomplete extends Filter_Type {
 
@@ -21,7 +21,7 @@ class Autocomplete extends Filter_Type {
     public function render( $filter ){
         return '<tainacan-filter-autocomplete name="'.$filter->get_name().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-autocomplete>';
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-autocomplete>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/category/Checkbox.vue b/src/classes/filter-types/category/Checkbox.vue
index aaadd7628..4f0d0984a 100644
--- a/src/classes/filter-types/category/Checkbox.vue
+++ b/src/classes/filter-types/category/Checkbox.vue
@@ -20,8 +20,8 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id ;
-            this.type = ( this.filter_type ) ? this.filter_type : this.filter.field.field_type;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ;
+            this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadatum_type;
             this.loadOptions();
         },
         data(){
@@ -30,21 +30,21 @@
                 options: [],
                 type: '',
                 collection: '',
-                field: '',
+                metadatum: '',
                 selected: [],
                 taxonomy: ''
             }
         },
         props: {
             filter: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             },
-            field_id: [Number], // not required, but overrides the filter field id if is set
-            collection_id: [Number], // not required, but overrides the filter field id if is set
-            filter_type: [String],  // not required, but overrides the filter field type if is set
+            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
+            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
+            filter_type: [String],  // not required, but overrides the filter metadatum type if is set
             id: '',
             query: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             }
         },
         watch: {
@@ -69,10 +69,10 @@
                 let promise = null;
                 this.isLoading = true;
 
-                axios.get('/collection/'+ this.collection +'/fields/' + this.field)
+                axios.get('/collection/'+ this.collection +'/metadata/' + this.metadatum)
                     .then( res => {
-                        let field = res.data;
-                        promise = this.getValuesCategory( field.field_type_options.taxonomy_id );
+                        let metadatum = res.data;
+                        promise = this.getValuesCategory( metadatum.metadatum_type_options.taxonomy_id );
 
                         promise.then( () => {
                             this.isLoading = false;
@@ -106,7 +106,7 @@
                 if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
                     return false;
 
-                let index = this.query.taxquery.findIndex(newField => newField.taxonomy === this.taxonomy );
+                let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy === this.taxonomy );
                 if ( index >= 0){
                     let metadata = this.query.taxquery[ index ];
                     this.selected = metadata.terms;
@@ -119,7 +119,7 @@
                     filter: 'selectbox',
                     taxonomy: this.taxonomy,
                     compare: 'IN',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: this.collection,
                     terms: this.selected
                 });
diff --git a/src/classes/filter-types/category/Selectbox.vue b/src/classes/filter-types/category/Selectbox.vue
index b1f14959f..ec525de86 100644
--- a/src/classes/filter-types/category/Selectbox.vue
+++ b/src/classes/filter-types/category/Selectbox.vue
@@ -23,8 +23,8 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id ;
-            this.type = ( this.filter_type ) ? this.filter_type : this.filter.field.field_type;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ;
+            this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadatum_type;
             this.loadOptions();
         },
         data(){
@@ -32,21 +32,21 @@
                 isLoading: false,
                 options: [],
                 collection: '',
-                field: '',
+                metadatum: '',
                 selected: '',
                 taxonomy: ''
             }
         },
         props: {
             filter: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             },
-            field_id: [Number], // not required, but overrides the filter field id if is set
-            collection_id: [Number], // not required, but overrides the filter field id if is set
-            filter_type: [String],  // not required, but overrides the filter field type if is set
+            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
+            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
+            filter_type: [String],  // not required, but overrides the filter metadatum type if is set
             id: '',
             query: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             }
         },
         watch: {
@@ -71,10 +71,10 @@
                 let promise = null;
                 this.isLoading = true;
 
-                axios.get('/collection/'+ this.collection +'/fields/' + this.field)
+                axios.get('/collection/'+ this.collection +'/metadata/' + this.metadatum)
                     .then( res => {
-                        let field = res.data;
-                        promise = this.getValuesCategory( field.field_type_options.taxonomy_id );
+                        let metadatum = res.data;
+                        promise = this.getValuesCategory( metadatum.metadatum_type_options.taxonomy_id );
 
                         promise.then( () => {
                             this.isLoading = false;
@@ -108,7 +108,7 @@
                 if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
                     return false;
 
-                let index = this.query.taxquery.findIndex(newField => newField.taxonomy === this.taxonomy );
+                let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy === this.taxonomy );
                 if ( index >= 0){
                     let metadata = this.query.taxquery[ index ];
                     this.selected = metadata.terms;
@@ -121,7 +121,7 @@
                     filter: 'selectbox',
                     compare: 'IN',
                     taxonomy: this.taxonomy,
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: this.collection,
                     terms: this.selected
                 });
diff --git a/src/classes/filter-types/category/Taginput.vue b/src/classes/filter-types/category/Taginput.vue
index 929e970ad..9f72b5194 100644
--- a/src/classes/filter-types/category/Taginput.vue
+++ b/src/classes/filter-types/category/Taginput.vue
@@ -19,19 +19,19 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id ;
-            this.type = ( this.filter_type ) ? this.filter_type : this.filter.field.field_type;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ;
+            this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadatum_type;
 
-            let in_route = '/collection/' + this.collection + '/fields/' +  this.field;
+            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
 
-            if(this.isRepositoryLevel){
-                in_route = '/fields/' + this.field;
+            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
+                in_route = '/metadata/'+ this.metadatum;
             }
 
             axios.get(in_route)
                 .then( res => {
-                    let field = res.data;
-                    this.selectedValues( field.field_type_options.taxonomy_id );
+                    let metadatum = res.data;
+                    this.selectedValues( metadatum.metadatum_type_options.taxonomy_id );
                 });
         },
         data(){
@@ -42,20 +42,20 @@
                 isLoading: false,
                 type: '',
                 collection: '',
-                field: '',
+                metadatum: '',
                 taxonomy: ''
             }
         },
         props: {
             filter: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             },
-            field_id: [Number], // not required, but overrides the filter field id if is set
-            collection_id: [Number], // not required, but overrides the filter field id if is set
-            filter_type: [String],  // not required, but overrides the filter field type if is set
+            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
+            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
+            filter_type: [String],  // not required, but overrides the filter metadatum type if is set
             id: '',
             query: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             },
             isRepositoryLevel: Boolean,
         },
@@ -72,7 +72,7 @@
                     filter: 'taginput',
                     compare: 'IN',
                     taxonomy: this.taxonomy,
-                    field_id: ( this.field_id ) ? this.field_id : this.filter.field,
+                    metadatum_id: ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum,
                     collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
                     terms: values
                 });
@@ -83,12 +83,12 @@
                 let promise = null;
                 this.options = [];
                 const q = query;
-                const endpoint = this.isRepositoryLevel ? '/fields/' + this.field : '/collection/'+ this.collection +'/fields/' + this.field;                 
+                const endpoint = this.isRepositoryLevel ? '/metadata/' + this.metadatum : '/collection/'+ this.collection +'/metadata/' + this.metadatum;
 
                 axios.get(endpoint)
                     .then( res => {
-                        let field = res.data;
-                        promise = this.getValuesCategory( field.field_type_options.taxonomy_id, q );
+                        let metadatum = res.data;
+                        promise = this.getValuesCategory( metadatum.metadatum_type_options.taxonomy_id, q );
                         this.isLoading = true;
                         promise.then( () => {
                             this.isLoading = false;
@@ -119,7 +119,7 @@
                 if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
                     return false;
 
-                let index = this.query.taxquery.findIndex(newField => newField.taxonomy === this.taxonomy );
+                let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy === this.taxonomy );
                 if ( index >= 0){
                     let metadata = this.query.taxquery[ index ];
                     for ( let id of metadata.terms ){
diff --git a/src/classes/filter-types/category/class-tainacan-categorycheckbox.php b/src/classes/filter-types/category/class-tainacan-categorycheckbox.php
index 1ad23958d..35db27482 100644
--- a/src/classes/filter-types/category/class-tainacan-categorycheckbox.php
+++ b/src/classes/filter-types/category/class-tainacan-categorycheckbox.php
@@ -4,7 +4,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class CategoryCheckbox extends Filter_Type {
 
@@ -20,8 +20,8 @@ class CategoryCheckbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-category-checkbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-checkbox>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-checkbox>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/category/class-tainacan-categoryselectbox.php b/src/classes/filter-types/category/class-tainacan-categoryselectbox.php
index 0ba28efc2..faba2d206 100644
--- a/src/classes/filter-types/category/class-tainacan-categoryselectbox.php
+++ b/src/classes/filter-types/category/class-tainacan-categoryselectbox.php
@@ -4,7 +4,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class CategorySelectbox extends Filter_Type {
 
@@ -20,8 +20,8 @@ class CategorySelectbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-category-selectbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-selectbox>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-selectbox>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/category/class-tainacan-categorytaginput.php b/src/classes/filter-types/category/class-tainacan-categorytaginput.php
index 3274c5441..b5a63999d 100644
--- a/src/classes/filter-types/category/class-tainacan-categorytaginput.php
+++ b/src/classes/filter-types/category/class-tainacan-categorytaginput.php
@@ -20,8 +20,8 @@ class CategoryTaginput extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-category-taginput name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-taginput>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-taginput>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index f0b51350b..f82bffc77 100644
--- a/src/classes/filter-types/checkbox/Checkbox.vue
+++ b/src/classes/filter-types/checkbox/Checkbox.vue
@@ -3,7 +3,7 @@
         <div
                 v-for="(option, index) in options"
                 :key="index"
-                class="field">
+                class="metadatum">
             <b-checkbox
                     v-model="selected"
                     :native-value="option.value"
@@ -19,21 +19,21 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
             const vm = this;
 
-            let in_route = '/collection/' + this.collection + '/fields/' +  this.field +'?nopaging=1';
+            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum +'?nopaging=1';
 
-            if(this.isRepositoryLevel){
-                in_route = '/fields?nopaging=1';
+            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
+                in_route = '/metadata?nopaging=1';
             }
 
             axios.get(in_route)
                 .then( res => {
                     let result = res.data;
-                    if( result && result.field_type ){
-                        vm.field_object = result;
-                        vm.type = result.field_type;
+                    if( result && result.metadatum_type ){
+                        vm.metadatum_object = result;
+                        vm.type = result.metadatum_type;
                         vm.loadOptions();
                     }
                 })
@@ -50,9 +50,9 @@
                 options: [],
                 type: '',
                 collection: '',
-                field: '',
+                metadatum: '',
                 selected: [],
-                field_object: {}
+                metadatum_object: {}
             }
         },
         mixins: [filter_type_mixin],
@@ -67,13 +67,13 @@
                 let promise = null;
                 this.isLoading = true;
 
-                if ( this.type === 'Tainacan\\Field_Types\\Relationship' ) {
-                    let collectionTarget = ( this.field_object && this.field_object.field_type_options.collection_id ) ?
-                        this.field_object.field_type_options.collection_id : this.collection_id;
+                if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) {
+                    let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ?
+                        this.metadatum_object.metadatum_type_options.collection_id : this.collection_id;
                     promise = this.getValuesRelationship( collectionTarget );
 
                 } else {
-                    promise = this.getValuesPlainText( this.field, null, this.isRepositoryLevel );
+                    promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel );
                 }
 
                 promise.then(() => {
@@ -89,7 +89,7 @@
                 this.$emit('input', {
                     filter: 'checkbox',
                     compare: 'IN',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
                     value: this.selected
                 });
@@ -98,7 +98,7 @@
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newField => newField.key === this.field );
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
                     this.selected = metadata.value;
diff --git a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
index 0cda49081..3fb34cb06 100644
--- a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
+++ b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
@@ -4,7 +4,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class Checkbox extends Filter_Type {
 
@@ -20,8 +20,8 @@ class Checkbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-checkbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-selectbox>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-selectbox>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue
index 2ebbf6999..3b79bbb13 100644
--- a/src/classes/filter-types/custom-interval/CustomInterval.vue
+++ b/src/classes/filter-types/custom-interval/CustomInterval.vue
@@ -64,20 +64,20 @@
         created(){
             const vm = this;
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
 
-            let in_route = '/collection/' + this.collection + '/fields/' +  this.field;
+            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
 
-            if(this.isRepositoryLevel){
-                in_route = '/fields/'+ this.field;
+            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
+                in_route = '/metadata/'+ this.metadatum;
             }
 
             axios.get(in_route)
                 .then( res => {
                     let result = res.data;
-                    if( result && result.field_type ){
-                        vm.field_object = result;
-                        vm.type = ( result.field_type === 'Tainacan\\Field_Types\\Date') ? 'date' : 'numeric';
+                    if( result && result.metadatum_type ){
+                        vm.metadatum_object = result;
+                        vm.type = ( result.metadatum_type === 'Tainacan\\Metadatum_Types\\Date') ? 'date' : 'numeric';
                         vm.selectedValues();
                     }
                 })
@@ -96,16 +96,16 @@
                 clear: false,
                 type: 'numeric',
                 collection: '',
-                field: '',
-                field_object: {},
+                metadatum: '',
+                metadatum_object: {},
             }
         },
         props: {
             filter: {
-                type: Object // concentrate all attributes field id and type
+                type: Object // concentrate all attributes metadatum id and type
             },
-            field_id: [Number], // not required, but overrides the filter field id if is set
-            collection_id: [Number], // not required, but overrides the filter field id if is set
+            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
+            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
             id: '',
             query: Object,
             isRepositoryLevel: Boolean,
@@ -165,7 +165,7 @@
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newField => newField.key === this.field );
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
                     if( metadata.value.length > 0 && this.type === 'numeric'){
@@ -204,7 +204,7 @@
                 this.$emit('input', {
                     filter: 'range',
                     compare: 'BETWEEN',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
                     value: ''
                 });
@@ -278,7 +278,7 @@
                     filter: 'range',
                     type: type,
                     compare: 'BETWEEN',
-                    field_id: vm.field,
+                    metadatum_id: vm.metadatum,
                     collection_id: ( vm.collection_id ) ? vm.collection_id : vm.filter.collection_id,
                     value: values
                 });
diff --git a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
index 7d365208c..44b2d151c 100644
--- a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
+++ b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
@@ -5,7 +5,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class Custom_Interval extends Filter_Type {
 
@@ -17,14 +17,14 @@ class Custom_Interval extends Filter_Type {
     /**
      * @param $filter
      * @return string
-     * @internal param $field
+     * @internal param $metadatum
      */
     public function render( $filter ){
-         $type = ( $filter->get_field()->get_field_type() === 'Tainacan\Field_Types\Date' ) ? 'date' : 'numeric';
+         $type = ( $filter->get_metadatum()->get_metadatum_type() === 'Tainacan\Metadatum_Types\Date' ) ? 'date' : 'numeric';
          return '<tainacan-filter-custom-interval 
                                         name="'.$filter->get_name().'"
                                         typeRange="'.$type.'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-custom-interval>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-custom-interval>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/filter-type/class-tainacan-filter-type.php b/src/classes/filter-types/filter-type/class-tainacan-filter-type.php
index 6824dbb29..c9c5628e2 100644
--- a/src/classes/filter-types/filter-type/class-tainacan-filter-type.php
+++ b/src/classes/filter-types/filter-type/class-tainacan-filter-type.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace Tainacan\Filter_Types;
-use Tainacan\Field_Types;
+use Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
@@ -15,10 +15,10 @@ abstract class Filter_Type {
         add_action('register_filter_types', array(&$this, 'register_filter_type'));
     }
 
-    abstract function render( $field );
+    abstract function render( $metadatum );
 
     /**
-     * generate the fields for this field type
+     * generate the metadata for this metadatum type
      */
     public function form(){
 
@@ -72,19 +72,19 @@ abstract class Filter_Type {
 	 *
 	 * This method should be declared by each filter type sub classes
 	 *
-	 * @param  \Tainacan\Entities\Filter $filter The field object that is beeing validated
+	 * @param  \Tainacan\Entities\Filter $filter The metadatum object that is beeing validated
 	 *
-	 * @return true|array True if options are valid. If invalid, returns an array where keys are the field keys and values are error messages.
+	 * @return true|array True if options are valid. If invalid, returns an array where keys are the metadatum keys and values are error messages.
 	 * @throws \Exception
 	 */
     public function validate_options(\Tainacan\Entities\Filter $filter) {
-        $field_type = $filter->get_field()->get_field_type();
-        //if there is no field to validate
-        if( !$field_type ){
+        $metadatum_type = $filter->get_metadatum()->get_metadatum_type();
+        //if there is no metadatum to validate
+        if( !$metadatum_type ){
             return true;
         }
 
-        $class = ( is_object( $field_type ) ) ? $field_type : new $field_type();
+        $class = ( is_object( $metadatum_type ) ) ? $metadatum_type : new $metadatum_type();
 
         if(in_array( $class->get_primitive_type(), $this->supported_types  )){
             return true;
diff --git a/src/classes/filter-types/filter-types-mixin.js b/src/classes/filter-types/filter-types-mixin.js
index c2e9ff0b3..a82e0a079 100644
--- a/src/classes/filter-types/filter-types-mixin.js
+++ b/src/classes/filter-types/filter-types-mixin.js
@@ -3,21 +3,21 @@ import { tainacan as axios } from '../../js/axios/axios';
 export const filter_type_mixin = {
     props: {
         filter: {
-            type: Object // concentrate all attributes field id and type
+            type: Object // concentrate all attributes metadatum id and type
         },
-        field_id: [Number], // not required, but overrides the filter field id if is set
-        collection_id: [Number], // not required, but overrides the filter field id if is set
-        filter_type: [String],  // not required, but overrides the filter field type if is set
+        metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
+        collection_id: [Number], // not required, but overrides the filter metadatum id if is set
+        filter_type: [String],  // not required, but overrides the filter metadatum type if is set
         id: '',
         query: {}
     },
     methods: {
-        getValuesPlainText(fieldId, search, isRepositoryLevel) {
+        getValuesPlainText(metadatumId, search, isRepositoryLevel) {
 
-            let url = '/collection/' + this.collection + '/fields/' + fieldId + '?fetch=all_field_values&nopaging=1';
+            let url = '/collection/' + this.collection + '/metadata/' + metadatumId + '?fetch=all_metadatum_values&nopaging=1';
 
             if(isRepositoryLevel){
-                url = '/fields/' + fieldId + '?fetch=all_field_values&nopaging=1';
+                url = '/metadata/' + metadatumId + '?fetch=all_metadatum_values&nopaging=1';
             }
 
             if( search ){
diff --git a/src/classes/filter-types/selectbox/Selectbox.vue b/src/classes/filter-types/selectbox/Selectbox.vue
index 357fcd9f1..5fe68524b 100644
--- a/src/classes/filter-types/selectbox/Selectbox.vue
+++ b/src/classes/filter-types/selectbox/Selectbox.vue
@@ -25,21 +25,21 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
             const vm = this;
 
-            let in_route = '/collection/' + this.collection + '/fields/' +  this.field;
+            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
 
-            if(this.isRepositoryLevel){
-                in_route = '/fields/'+ this.field;
+            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
+                in_route = '/metadata/'+ this.metadatum;
             }
 
             axios.get(in_route)
                 .then( res => {
                     let result = res.data;
-                    if( result && result.field_type ){
-                        vm.field_object = result;
-                        vm.type = result.field_type;
+                    if( result && result.metadatum_type ){
+                        vm.metadatum_object = result;
+                        vm.type = result.metadatum_type;
                         vm.loadOptions();
                     }
                 })
@@ -56,7 +56,7 @@
                 options: [],
                 type: '',
                 collection: '',
-                field: ''
+                metadatum: ''
             }
         },
         mixins: [filter_type_mixin],
@@ -64,7 +64,7 @@
             selected() {
                 if ( this.query && this.query.metaquery && Array.isArray( this.query.metaquery ) ) {
 
-                    let index = this.query.metaquery.findIndex(newField => newField.key === this.field );
+                    let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
                     if ( index >= 0){
                         let metadata = this.query.metaquery[ index ];
                         return metadata.value;
@@ -78,7 +78,7 @@
                 this.isLoading = true;
 
                 let promise = null;
-                promise = this.getValuesPlainText( this.field, null, this.isRepositoryLevel );
+                promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel );
 
                 promise.then(() => {
                     this.isLoading = false;
@@ -91,7 +91,7 @@
             onSelect(value){
                 this.$emit('input', {
                     filter: 'selectbox',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
                     value: ( value ) ? value : ''
                 });
@@ -100,7 +100,7 @@
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newField => newField.key === this.field );
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
                     this.selected = metadata.value;
diff --git a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
index c4871600b..b96f1670b 100644
--- a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
+++ b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
@@ -4,7 +4,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class Selectbox extends Filter_Type {
 
@@ -20,8 +20,8 @@ class Selectbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-selectbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-selectbox>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-selectbox>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/taginput/Taginput.vue b/src/classes/filter-types/taginput/Taginput.vue
index 49faaaf5e..c9e810950 100644
--- a/src/classes/filter-types/taginput/Taginput.vue
+++ b/src/classes/filter-types/taginput/Taginput.vue
@@ -21,21 +21,21 @@
     export default {
         created(){
             this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.field = ( this.field_id ) ? this.field_id : this.filter.field.field_id;
+            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
             const vm = this;
 
-            let in_route = '/collection/' + this.collection + '/fields/' +  this.field;
+            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
 
-            if(this.isRepositoryLevel){
-                in_route = '/fields?nopaging=1';
+            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
+                in_route = '/metadata?nopaging=1';
             }
 
             axios.get(in_route)
                 .then( res => {
                     let result = res.data;
-                    if( result && result.field_type ){
-                        vm.field_object = result;
-                        vm.type = result.field_type;
+                    if( result && result.metadatum_type ){
+                        vm.metadatum_object = result;
+                        vm.type = result.metadatum_type;
                         vm.selectedValues();
                     }
                 })
@@ -51,8 +51,8 @@
                 isLoading: false,
                 type: '',
                 collection: '',
-                field: '',
-                field_object: {}
+                metadatum: '',
+                metadatum_object: {}
             }
         },
         props: {
@@ -71,7 +71,7 @@
                 this.$emit('input', {
                     filter: 'taginput',
                     compare: 'IN',
-                    field_id: this.field,
+                    metadatum_id: this.metadatum,
                     collection_id: this.collection,
                     value: values
                 });
@@ -81,13 +81,13 @@
             search( query ){
                 let promise = null;
                 this.options = [];
-                if ( this.type === 'Tainacan\\Field_Types\\Relationship' ) {
-                    let collectionTarget = ( this.field_object && this.field_object.field_type_options.collection_id ) ?
-                        this.field_object.field_type_options.collection_id : this.collection_id;
+                if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) {
+                    let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ?
+                        this.metadatum_object.metadatum_type_options.collection_id : this.collection_id;
                     promise = this.getValuesRelationship( collectionTarget, query );
 
                 } else {
-                    promise = this.getValuesPlainText( this.field, query, this.isRepositoryLevel );
+                    promise = this.getValuesPlainText( this.metadatum, query, this.isRepositoryLevel );
                 }
                 this.isLoading = true;
                 promise.then(() => {
@@ -102,14 +102,14 @@
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newField => newField.key === this.field );
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
-                    let collectionTarget = ( this.field_object && this.field_object.field_type_options.collection_id ) ?
-                        this.field_object.field_type_options.collection_id : this.collection_id;
+                    let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ?
+                        this.metadatum_object.metadatum_type_options.collection_id : this.collection_id;
 
 
-                    if ( this.type === 'Tainacan\\Field_Types\\Relationship' ) {
+                    if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) {
                         let query = qs.stringify({ postin: metadata.value  });
 
                         axios.get('/collection/' + collectionTarget + '/items?' + query)
diff --git a/src/classes/filter-types/taginput/class-tainacan-taginput.php b/src/classes/filter-types/taginput/class-tainacan-taginput.php
index 00ac4de29..354fbdcc0 100644
--- a/src/classes/filter-types/taginput/class-tainacan-taginput.php
+++ b/src/classes/filter-types/taginput/class-tainacan-taginput.php
@@ -4,7 +4,7 @@ namespace Tainacan\Filter_Types;
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
 class Taginput extends Filter_Type {
 
@@ -20,8 +20,8 @@ class Taginput extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-taginput name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_field()->get_field_type().'"
+                                        filter_type="'.$filter->get_metadatum()->get_metadatum_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        field_id="'.$filter->get_field()->get_id().'"></tainacan-filter-taginput>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-taginput>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index 3adc2ab70..a4042a9d3 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -66,7 +66,7 @@
                 'setPage'
             ]),
             listen( event ){
-                this.$eventBusSearch.$emit( 'input', ( event.field_id ) ?  event :  event.detail[0] );
+                this.$eventBusSearch.$emit( 'input', ( event.metadatum_id ) ?  event :  event.detail[0] );
             },
             setFilterTypeMessage( message ){
                 this.filterTypeMessage = message;
diff --git a/src/classes/field-types/category/AddNewTerm.vue b/src/classes/metadatum-types/category/AddNewTerm.vue
similarity index 93%
rename from src/classes/field-types/category/AddNewTerm.vue
rename to src/classes/metadatum-types/category/AddNewTerm.vue
index 44f0d2af0..7b3a2bc4f 100644
--- a/src/classes/field-types/category/AddNewTerm.vue
+++ b/src/classes/metadatum-types/category/AddNewTerm.vue
@@ -54,13 +54,13 @@
                 name: '',
                 parent: 0,
                 showForm: false,
-                field_id: this.field.field.id
+                metadatum_id: this.metadatum.metadatum.id
             }
         },
         props: {
             id: String,
             item_id: [Number,String],
-            field: [Number,String],
+            metadatum: [Number,String],
             taxonomy_id: [Number,String],
             value:[ Array, Boolean, Number ],
             options: {
@@ -100,8 +100,8 @@
                             let id = ( res.id ) ? res.id : res.data.id;
                             let val = this.value;
 
-                            if( !Array.isArray( val ) && this.field.field.multiple === 'no' ){
-                                axios.patch(`/item/${this.item_id}/metadata/${this.field_id}`, {
+                            if( !Array.isArray( val ) && this.metadatum.metadatum.multiple === 'no' ){
+                                axios.patch(`/item/${this.item_id}/metadata/${this.metadatum_id}`, {
                                     values: id,
                                 }).then(() => {
                                     instance.$emit('newTerm', id);
@@ -109,7 +109,7 @@
                             } else {
                                 val = ( val ) ? val : [];
                                 val.push( id );
-                                axios.patch(`/item/${this.item_id}/metadata/${this.field_id}`, {
+                                axios.patch(`/item/${this.item_id}/metadata/${this.metadatum_id}`, {
                                     values: val,
                                 }).then( () => {
                                     instance.$emit('newTerm', val);
diff --git a/src/classes/field-types/category/Category.vue b/src/classes/metadatum-types/category/Category.vue
similarity index 76%
rename from src/classes/field-types/category/Category.vue
rename to src/classes/metadatum-types/category/Category.vue
index 276867926..f0b8ef293 100644
--- a/src/classes/field-types/category/Category.vue
+++ b/src/classes/metadatum-types/category/Category.vue
@@ -10,8 +10,8 @@
                 class="add-new-term"
                 v-if="getComponent() !== 'tainacan-category-tag-input' && allowNew"
                 :taxonomy_id="taxonomy"
-                :field="field"
-                :item_id="field.item.id"
+                :metadatum="metadatum"
+                :item_id="metadatum.item.id"
                 :value="valueComponent"
                 :options="getOptions(0)"
                 @newTerm="reload"/>
@@ -27,15 +27,15 @@
 
     export default {
         created(){
-            let field_type_options = this.field.field.field_type_options;
-            this.component = ( field_type_options && field_type_options.input_type )
-                ? this.field.field.field_type_options.input_type : this.componentAttribute
+            let metadatum_type_options = this.metadatum.metadatum.metadatum_type_options;
+            this.component = ( metadatum_type_options && metadatum_type_options.input_type )
+                ? this.metadatum.metadatum.metadatum_type_options.input_type : this.componentAttribute
 
-            this.collectionId = this.field.field.collection_id;
-            this.taxonomy = field_type_options.taxonomy_id;
+            this.collectionId = this.metadatum.metadatum.collection_id;
+            this.taxonomy = metadatum_type_options.taxonomy_id;
 
-            if( field_type_options && field_type_options.allow_new_terms ){
-                this.allowNew = field_type_options.allow_new_terms === 'yes'
+            if( metadatum_type_options && metadatum_type_options.allow_new_terms ){
+                this.allowNew = metadatum_type_options.allow_new_terms === 'yes'
             }
             this.getTermsFromTaxonomy();
             this.getTermsId();
@@ -65,7 +65,7 @@
             }
         },
         props: {
-            field: {
+            metadatum: {
                 type: Object
             },
             componentAttribute: {
@@ -76,9 +76,9 @@
         },
         methods: {
             getComponent(){
-                if( this.field.field
-                    && this.field.field.field_type_options && this.field.field.field_type_options.input_type ){
-                    return this.field.field.field_type_options.input_type;
+                if( this.metadatum.metadatum
+                    && this.metadatum.metadatum.metadatum_type_options && this.metadatum.metadatum.metadatum_type_options.input_type ){
+                    return this.metadatum.metadatum.metadatum_type_options.input_type;
                 }
             },
             getTermsFromTaxonomy(){
@@ -115,8 +115,8 @@
                   }
               }
 
-              if( values.length > 0 && this.field.field){
-                  this.valueComponent = (  this.field.field && this.field.field.multiple === 'no' ) ? values[0] : values
+              if( values.length > 0 && this.metadatum.metadatum){
+                  this.valueComponent = (  this.metadatum.metadatum && this.metadatum.metadatum.multiple === 'no' ) ? values[0] : values
               }
 
             },
diff --git a/src/classes/field-types/category/CategoryCheckbox.vue b/src/classes/metadatum-types/category/CategoryCheckbox.vue
similarity index 100%
rename from src/classes/field-types/category/CategoryCheckbox.vue
rename to src/classes/metadatum-types/category/CategoryCheckbox.vue
diff --git a/src/classes/field-types/category/CategoryRadio.vue b/src/classes/metadatum-types/category/CategoryRadio.vue
similarity index 100%
rename from src/classes/field-types/category/CategoryRadio.vue
rename to src/classes/metadatum-types/category/CategoryRadio.vue
diff --git a/src/classes/field-types/category/CategorySelectbox.vue b/src/classes/metadatum-types/category/CategorySelectbox.vue
similarity index 100%
rename from src/classes/field-types/category/CategorySelectbox.vue
rename to src/classes/metadatum-types/category/CategorySelectbox.vue
diff --git a/src/classes/field-types/category/CategoryTaginput.vue b/src/classes/metadatum-types/category/CategoryTaginput.vue
similarity index 100%
rename from src/classes/field-types/category/CategoryTaginput.vue
rename to src/classes/metadatum-types/category/CategoryTaginput.vue
diff --git a/src/classes/field-types/category/FormCategory.vue b/src/classes/metadatum-types/category/FormCategory.vue
similarity index 96%
rename from src/classes/field-types/category/FormCategory.vue
rename to src/classes/metadatum-types/category/FormCategory.vue
index f06e33d93..17e8794c4 100644
--- a/src/classes/field-types/category/FormCategory.vue
+++ b/src/classes/metadatum-types/category/FormCategory.vue
@@ -38,8 +38,8 @@
             </label>
             <b-select
                     v-if="listInputType"
-                    name="field_type_options[component_type]"
-                    placeholder="Select the input type for the category field"
+                    name="metadatum_type_options[component_type]"
+                    placeholder="Select the input type for the category metadatum"
                     @input="emitValues()"
                     v-model="input_type">
                 <option
@@ -51,8 +51,8 @@
             </b-select>
 
             <b-select
-                    name="field_type_options[input_type]"
-                    placeholder="Select the input type for the category field"
+                    name="metadatum_type_options[input_type]"
+                    placeholder="Select the input type for the category metadatum"
                     v-model="input_type"
                     @input="emitValues()"
                     v-else>
@@ -96,7 +96,7 @@
         components: {BCheckbox},
         props: {
             value: [ String, Object, Array ],
-            field: [ String, Object ],
+            metadatum: [ String, Object ],
             errors: [ String, Object, Array ]
         },
         created(){
@@ -119,7 +119,7 @@
         },
         computed: {
             listInputType(){
-                if( this.field && this.field.multiple === 'no' ){
+                if( this.metadatum && this.metadatum.multiple === 'no' ){
                     let types = Object.keys( this.single_types );
                     let hasValue = this.value && this.value.input_type && types.indexOf( this.value.input_type ) >= 0;
                     this.setInputType( ( hasValue ) ? this.value.input_type : 'tainacan-category-radio' );
diff --git a/src/classes/field-types/category/class-tainacan-category.php b/src/classes/metadatum-types/category/class-tainacan-category.php
similarity index 73%
rename from src/classes/field-types/category/class-tainacan-category.php
rename to src/classes/metadatum-types/category/class-tainacan-category.php
index 473f32ef0..1294692ea 100644
--- a/src/classes/field-types/category/class-tainacan-category.php
+++ b/src/classes/metadatum-types/category/class-tainacan-category.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
-use Tainacan\Entities\Field;
+use Tainacan\Entities\Metadatum;
 use Tainacan\Entities\Item_Metadata_Entity;
-use Tainacan\Repositories\Fields;
+use Tainacan\Repositories\Metadata;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Category extends Field_Type {
+class Category extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('term');
         
@@ -55,36 +55,36 @@ class Category extends Field_Type {
         $options = ( isset( $this->get_options()['options'] ) ) ? $this->get_options()['options'] : '';
         return '<tainacan-selectbox    
                                        options="' . $options . '"
-                                       field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                                       metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                        item_id="'.$itemMetadata->get_item()->get_id().'"    
                                        value=\''.json_encode( $itemMetadata->get_value() ).'\'
-                                       name="'.$itemMetadata->get_field()->get_name().'"></tainacan-selectbox>';
+                                       name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-selectbox>';
     }
 	
-	public function validate_options( Field $field) {
+	public function validate_options( Metadatum $metadatum) {
 		
-		if ( !in_array($field->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+		if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
             return true;
 		
 		if (empty($this->get_option('taxonomy_id')))
 			return ['taxonomy_id' => __('Please select a taxonomy', 'tainacan')];
 		
-		$Tainacan_Fields = Fields::get_instance();
+		$Tainacan_Metadata = Metadata::get_instance();
 		
-		$category_fields = $Tainacan_Fields->fetch([
-			'collection_id' => $field->get_collection_id(),
-			'field_type' => 'Tainacan\\Field_Types\\Category'
+		$category_metadata = $Tainacan_Metadata->fetch([
+			'collection_id' => $metadatum->get_collection_id(),
+			'metadatum_type' => 'Tainacan\\Metadatum_Types\\Category'
 		], 'OBJECT');
 		
-		$category_fields = array_map(function ($field_map) {
-			$fto = $field_map->get_field_type_object();
-			return [ $field_map->get_id() => $fto->get_option('taxonomy_id') ];
-		}, $category_fields);
+		$category_metadata = array_map(function ($metadatum_map) {
+			$fto = $metadatum_map->get_metadatum_type_object();
+			return [ $metadatum_map->get_id() => $fto->get_option('taxonomy_id') ];
+		}, $category_metadata);
 
-		if( is_array( $category_fields ) ){
-            foreach ($category_fields as $field_id => $category_field) {
-                if ( is_array( $category_field ) && key($category_field) != $field->get_id()
-                    && in_array($this->get_option('taxonomy_id'), $category_field)) {
+		if( is_array( $category_metadata ) ){
+            foreach ($category_metadata as $metadatum_id => $category_metadatum) {
+                if ( is_array( $category_metadatum ) && key($category_metadatum) != $metadatum->get_id()
+                    && in_array($this->get_option('taxonomy_id'), $category_metadatum)) {
                     return ['taxonomy_id' => __('You can not have 2 taxonomy metadata using the same taxonomy in a collection.', 'tainacan')];
                 }
 		    }
@@ -95,7 +95,7 @@ class Category extends Field_Type {
 	}
 
 	/**
-	 * Validate item based on field type categories options
+	 * Validate item based on metadatum type categories options
 	 *
 	 * @param Item_Metadata_Entity $item_metadata
 	 *
@@ -137,7 +137,7 @@ class Category extends Field_Type {
     }
 	
 	/**
-	 * Return the value of an Item_Metadata_Entity using a field of this field type as an html string
+	 * Return the value of an Item_Metadata_Entity using a metadatum of this metadatum type as an html string
 	 * @param  Item_Metadata_Entity $item_metadata 
 	 * @return string The HTML representation of the value, containing one or multiple terms, separated by comma, linked to term page
 	 */
diff --git a/src/classes/field-types/compound/class-tainacan-compound.php b/src/classes/metadatum-types/compound/class-tainacan-compound.php
similarity index 67%
rename from src/classes/field-types/compound/class-tainacan-compound.php
rename to src/classes/metadatum-types/compound/class-tainacan-compound.php
index 79f21b204..ac8882155 100644
--- a/src/classes/field-types/compound/class-tainacan-compound.php
+++ b/src/classes/metadatum-types/compound/class-tainacan-compound.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
-use Tainacan\Entities\Field;
+use Tainacan\Entities\Metadatum;
 use Tainacan\Entities\Item_Metadata_Entity;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Compound extends Field_Type {
+class Compound extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('compound');
         $this->set_component('tainacan-compound');
@@ -27,14 +27,14 @@ class Compound extends Field_Type {
     public function render( $itemMetadata ){
         return '<tainacan-text 
                                id="tainacan-text-' . $itemMetadata->get_item()->WP_Post->post_name . '"
-                               field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                               metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                item_id="'.$itemMetadata->get_item()->get_id().'"    
                                value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                               name="'.$itemMetadata->get_field()->get_name().'"></tainacan-text>';
+                               name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-text>';
     }
 
     /**
-     * generate the fields for this field type
+     * generate the metadata for this metadatum type
      */
     public function form(){
 
@@ -42,9 +42,9 @@ class Compound extends Field_Type {
 	
 		
 	/**
-	 * Return the value of an Item_Metadata_Entity using a field of this field type as an html string
+	 * Return the value of an Item_Metadata_Entity using a metadatum of this metadatum type as an html string
 	 * @param  Item_Metadata_Entity $item_metadata 
-	 * @return string The HTML representation of the value, each HTML representation of the value of each field composing this metadata
+	 * @return string The HTML representation of the value, each HTML representation of the value of each metadatum composing this metadata
 	 */
 	public function get_value_as_html(Item_Metadata_Entity $item_metadata) {
 		
@@ -58,11 +58,11 @@ class Compound extends Field_Type {
 			
 			foreach ( $value as $compound_element ) {
 				
-				$return .= '<div class="tainacan-compund-field">';
+				$return .= '<div class="tainacan-compund-metadatum">';
 				
 				foreach ( $compound_element as $meta ) {
 					if ( $meta instanceof Item_Metadata_Entity ) {
-						$return .= '<h4>' . $meta->get_field()->get_name() . "</h4>\n";
+						$return .= '<h4>' . $meta->get_metadatum()->get_name() . "</h4>\n";
 						$return .= '<p>' . $meta->get_value_as_html() . '</p>' . "\n\n";
 					}
 				}
@@ -78,10 +78,10 @@ class Compound extends Field_Type {
 			
 			foreach ( $value as $meta ) {
 				
-				$return .= '<div class="tainacan-compund-field">';
+				$return .= '<div class="tainacan-compund-metadatum">';
 				
 				if ( $meta instanceof Item_Metadata_Entity ) {
-					$return .= '<h4>' . $meta->get_field()->get_name() . "</h4>\n";
+					$return .= '<h4>' . $meta->get_metadatum()->get_name() . "</h4>\n";
 					$return .= '<p>' . $meta->get_value_as_html() . '</p>';
 				}
 				
diff --git a/src/classes/field-types/core-description/class-tainacan-core-description.php b/src/classes/metadatum-types/core-description/class-tainacan-core-description.php
similarity index 70%
rename from src/classes/field-types/core-description/class-tainacan-core-description.php
rename to src/classes/metadatum-types/core-description/class-tainacan-core-description.php
index 606ebe952..cc49f00c4 100644
--- a/src/classes/field-types/core-description/class-tainacan-core-description.php
+++ b/src/classes/metadatum-types/core-description/class-tainacan-core-description.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
-use Tainacan\Entities\Field;
+use Tainacan\Entities\Metadatum;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Core_Description extends Field_Type {
+class Core_Description extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('string');
         $this->set_core(true);
@@ -28,21 +28,21 @@ class Core_Description extends Field_Type {
      public function render( $itemMetadata ){
          return '<tainacan-textarea 
                          id="tainacan-textarea-' . $itemMetadata->get_item()->WP_Post->post_name . '"
-                         field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                         metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                          item_id="'.$itemMetadata->get_item()->get_id().'"    
                          value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                         name="'.$itemMetadata->get_field()->get_name().'"></tainacan-textarea>';
+                         name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-textarea>';
      }
 
     /**
-     * generate the fields for this field type
+     * generate the metadata for this metadatum type
      */
     public function form(){
 
     }
     
     /**
-     * Description core Field type is stored as the item content (description)
+     * Description core Metadatum type is stored as the item content (description)
      *
      * Lets validate it as the item description
      *
@@ -67,12 +67,12 @@ class Core_Description extends Field_Type {
 	
 	*/
 
-    public function validate_options( Field $field ) {
+    public function validate_options( Metadatum $metadatum ) {
 		
-		if ( !in_array($field->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+		if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
             return true;
 		
-        if ( $field->get_multiple() != 'no') {
+        if ( $metadatum->get_multiple() != 'no') {
             return ['multiple' => __('Core Metadata can not accept multiple values', 'tainacan')];
         }
 		
diff --git a/src/classes/field-types/core-title/class-tainacan-core-title.php b/src/classes/metadatum-types/core-title/class-tainacan-core-title.php
similarity index 70%
rename from src/classes/field-types/core-title/class-tainacan-core-title.php
rename to src/classes/metadatum-types/core-title/class-tainacan-core-title.php
index 5648f894a..95da055e0 100644
--- a/src/classes/field-types/core-title/class-tainacan-core-title.php
+++ b/src/classes/metadatum-types/core-title/class-tainacan-core-title.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
-use Tainacan\Entities\Field;
+use Tainacan\Entities\Metadatum;
 
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Core_Title extends Field_Type {
+class Core_Title extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('string');
         $this->set_core(true);
@@ -29,21 +29,21 @@ class Core_Title extends Field_Type {
     public function render( $itemMetadata ){
         return '<tainacan-text 
                                id="tainacan-text-' . $itemMetadata->get_item()->WP_Post->post_name . '"
-                               field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                               metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                item_id="'.$itemMetadata->get_item()->get_id().'"    
                                value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                               name="'.$itemMetadata->get_field()->get_name().'"></tainacan-text>';
+                               name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-text>';
     }
 
     /**
-     * generate the fields for this field type
+     * generate the metadata for this metadatum type
      */
     public function form(){
 
     }
     
     /**
-     * Title core Field type is stored as the item title
+     * Title core Metadatum type is stored as the item title
      *
      * Lets validate it as the item title
      *
@@ -67,12 +67,12 @@ class Core_Title extends Field_Type {
     }
 	 */
 
-    public function validate_options( Field $field ) {
+    public function validate_options( Metadatum $metadatum ) {
 		
-		if ( !in_array($field->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+		if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
             return true;
 		
-        if ( $field->get_multiple() != 'no') {
+        if ( $metadatum->get_multiple() != 'no') {
             return ['multiple' => __('Core Metadata can not accept multiple values', 'tainacan')];
         }
 		
diff --git a/src/classes/field-types/date/Date.vue b/src/classes/metadatum-types/date/Date.vue
similarity index 99%
rename from src/classes/field-types/date/Date.vue
rename to src/classes/metadatum-types/date/Date.vue
index df6917a83..b1a7bf46f 100644
--- a/src/classes/field-types/date/Date.vue
+++ b/src/classes/metadatum-types/date/Date.vue
@@ -61,7 +61,7 @@
         },
         props: {
             id: '',
-            field: {
+            metadatum: {
                 type: Object
             },
             value: [String, Number, Array],
diff --git a/src/classes/field-types/date/class-tainacan-date.php b/src/classes/metadatum-types/date/class-tainacan-date.php
similarity index 64%
rename from src/classes/field-types/date/class-tainacan-date.php
rename to src/classes/metadatum-types/date/class-tainacan-date.php
index 2beec58d3..8ad0b77cc 100644
--- a/src/classes/field-types/date/class-tainacan-date.php
+++ b/src/classes/metadatum-types/date/class-tainacan-date.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 use Tainacan\Helpers;
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Date extends Field_Type {
+class Date extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('date');
         $this->set_component('tainacan-date');
@@ -23,9 +23,9 @@ class Date extends Field_Type {
      */
 
     public function render( $itemMetadata ){
-        return '<tainacan-date field_id ="'.$itemMetadata->get_field()->get_id().'" 
+        return '<tainacan-date metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                item_id="'.$itemMetadata->get_item()->get_id().'"    
                                value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                               name="'.$itemMetadata->get_field()->get_name().'"></tainacan-date>';
+                               name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-date>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/field-types/field-type/class-tainacan-field-type.php b/src/classes/metadatum-types/metadatum-type/class-tainacan-metadatum-type.php
similarity index 74%
rename from src/classes/field-types/field-type/class-tainacan-field-type.php
rename to src/classes/metadatum-types/metadatum-type/class-tainacan-metadatum-type.php
index a40704bfe..239f44491 100644
--- a/src/classes/field-types/field-type/class-tainacan-field-type.php
+++ b/src/classes/metadatum-types/metadatum-type/class-tainacan-metadatum-type.php
@@ -1,36 +1,36 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-abstract class Field_Type  {
+abstract class Metadatum_Type  {
 
     
     /**
-     * Indicates the type of variable that this field type handles.
+     * Indicates the type of variable that this metadatum type handles.
      *
-     * This is used to relate Field types and filter types, so we know which filter types
-     * will be available to be used for each field based on its Field Type
+     * This is used to relate Metadatum types and filter types, so we know which filter types
+     * will be available to be used for each metadatum based on its Metadatum Type
      *
-     * For instance, the Filter Type "input text" may be used to search in any field that has
-     * a Field Type with a string primitive type.
+     * For instance, the Filter Type "input text" may be used to search in any metadatum that has
+     * a Metadatum Type with a string primitive type.
      * 
      * @var string
      */
     private $primitive_type;
     
     /**
-     * Array of options specific to this field type. Stored in field_type_options property of the Field object
+     * Array of options specific to this metadatum type. Stored in metadatum_type_options property of the Metadatum object
      * @var array
      */
     private $options = [];
     
     /**
-     * The default values for the field type options array
+     * The default values for the metadatum type options array
      * @var array
      */
     private $default_options = [];
@@ -38,9 +38,9 @@ abstract class Field_Type  {
     private $errors;
     
     /**
-     * Indicates whether this is a core Field Type or not
+     * Indicates whether this is a core Metadatum Type or not
      *
-     * Core field types are used by Title and description fields. These fields:
+     * Core metadatum types are used by Title and description metadata. These metadata:
      * * Can only be used once, they belong to the repository and can not be deleted
      * * Its values are saved in th wp_post table, and not as post_meta 
      * 
@@ -48,12 +48,12 @@ abstract class Field_Type  {
     private $core = false;
     
     /**
-     * Used by core field types to indicate where it should be saved
+     * Used by core metadatum types to indicate where it should be saved
      */
     private $related_mapped_prop = false;
     
     /**
-     * The name of the web component used by this field type
+     * The name of the web component used by this metadatum type
      * @var string
      */
     private $component;
@@ -126,9 +126,9 @@ abstract class Field_Type  {
     }
     
     /**
-     * Gets the options for this field types, including default values for options
+     * Gets the options for this metadatum types, including default values for options
      * that were not set yet.
-     * @return array Field type options
+     * @return array Metadatum type options
      */
     public function get_options() {
         return array_merge($this->default_options, $this->options);
@@ -154,7 +154,7 @@ abstract class Field_Type  {
        return [];
     }
     /**
-     * generate the fields for this field type
+     * generate the metadata for this metadatum type
      */
     public function form(){
 
@@ -179,12 +179,12 @@ abstract class Field_Type  {
     /**
      * Validates the options Array
      *
-     * This method should be declared by each field type sub classes
+     * This method should be declared by each metadatum type sub classes
      * 
-     * @param  \Tainacan\Entities\Field  $field The field object that is beeing validated
-     * @return true|Array True if optinos are valid. If invalid, returns an array where keys are the field keys and values are error messages.
+     * @param  \Tainacan\Entities\Metadatum  $metadatum The metadatum object that is beeing validated
+     * @return true|Array True if optinos are valid. If invalid, returns an array where keys are the metadatum keys and values are error messages.
      */
-    public function validate_options(\Tainacan\Entities\Field $field) {
+    public function validate_options(\Tainacan\Entities\Metadatum $metadatum) {
         return true;
     }
 
diff --git a/src/classes/field-types/numeric/Numeric.vue b/src/classes/metadatum-types/numeric/Numeric.vue
similarity index 97%
rename from src/classes/field-types/numeric/Numeric.vue
rename to src/classes/metadatum-types/numeric/Numeric.vue
index 2fee811af..e6ba0bc4d 100644
--- a/src/classes/field-types/numeric/Numeric.vue
+++ b/src/classes/metadatum-types/numeric/Numeric.vue
@@ -24,7 +24,7 @@
         },
         props: {
             id: '',
-            field: {
+            metadatum: {
                 type: Object
             },
             value: [String, Number, Array],
diff --git a/src/classes/field-types/numeric/class-tainacan-numeric.php b/src/classes/metadatum-types/numeric/class-tainacan-numeric.php
similarity index 64%
rename from src/classes/field-types/numeric/class-tainacan-numeric.php
rename to src/classes/metadatum-types/numeric/class-tainacan-numeric.php
index c5c47e9e0..3ed61d0a1 100644
--- a/src/classes/field-types/numeric/class-tainacan-numeric.php
+++ b/src/classes/metadatum-types/numeric/class-tainacan-numeric.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Numeric extends Field_Type {
+class Numeric extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('float');
         $this->set_component('tainacan-numeric');
@@ -23,9 +23,9 @@ class Numeric extends Field_Type {
 
     public function render( $itemMetadata ){
         return '<tainacan-numeric  
-                                   field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                                   metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                    item_id="'.$itemMetadata->get_item()->get_id().'"    
                                    value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                                   name="'.$itemMetadata->get_field()->get_name().'"></tainacan-numeric>';
+                                   name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-numeric>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/field-types/relationship/FormRelationship.vue b/src/classes/metadatum-types/relationship/FormRelationship.vue
similarity index 81%
rename from src/classes/field-types/relationship/FormRelationship.vue
rename to src/classes/metadatum-types/relationship/FormRelationship.vue
index 42cdbc868..a474ce46c 100644
--- a/src/classes/field-types/relationship/FormRelationship.vue
+++ b/src/classes/metadatum-types/relationship/FormRelationship.vue
@@ -12,7 +12,7 @@
                         :message="$i18n.getHelperMessage('tainacan-relationship', 'collection_id')"/>
             </label>
             <b-select
-                    name="field_type_relationship[collection_id]"
+                    name="metadatum_type_relationship[collection_id]"
                     placeholder="Select the collection to fetch items"
                     v-model="collection"
                     @change.native="emitValues()"
@@ -30,24 +30,24 @@
 
         <transition name="fade">
             <div
-                v-if="loadingFields"
+                v-if="loadingMetadata"
                 class="loading-spinner"/>
             <b-field
-                    v-if="hasFields"
+                    v-if="hasMetadata"
                     :addons="false">
                 <label class="label">
-                    {{ $i18n.get('label_fields_for_search') }}
+                    {{ $i18n.get('label_metadata_for_search') }}
                     <help-button
                             :title="$i18n.getHelperTitle('tainacan-relationship', 'search')"
                             :message="$i18n.getHelperMessage('tainacan-relationship', 'search')"/>
                 </label>
                 <div class="block">
                     <div
-                        v-for="(option, index) in fields"
+                        v-for="(option, index) in metadata"
                         :key="index"
                         class="field">
                         <b-checkbox
-                                name="field_type_relationship[search][]"
+                                name="metadatum_type_relationship[search][]"
                                 v-model="modelSearch"
                                 :native-value="option.id">
                             {{ option.name }}
@@ -88,18 +88,18 @@
             collection_id: [ Number ],
             repeated: [ String ],
             value: [ String, Object, Array ],
-            field: [ String, Object ],
+            metadatum: [ String, Object ],
             errors: [ String, Object, Array ]
         },
         data(){
             return {
                 icon: '',
                 collections:[],
-                fields: [],
+                metadata: [],
                 loading: true,
                 collection: '',
-                hasFields: false,
-                loadingFields: false,
+                hasMetadata: false,
+                loadingMetadata: false,
                 modelRepeated: 'yes',
                 modelSearch:[],
                 collectionType: '',
@@ -110,10 +110,10 @@
             collection( value ){
                 this.collection = value;
                 if( value && value !== '' ) {
-                    this.fetchFieldsFromCollection(value);
+                    this.fetchMetadataFromCollection(value);
                 } else {
-                    this.fields = [];
-                    this.hasFields = false;
+                    this.metadata = [];
+                    this.hasMetadata = false;
                     this.modelSearch = [];
 
                     this.emitValues();
@@ -170,32 +170,32 @@
                         this.$console.log(error);
                     });
             },
-            fetchFieldsFromCollection( value ){
-                this.loadingFields = true;
-                this.hasFields = false;
+            fetchMetadataFromCollection( value ){
+                this.loadingMetadata = true;
+                this.hasMetadata = false;
 
-                axios.get('/collection/' + value + '/fields/')
+                axios.get('/collection/' + value + '/metadata/')
                     .then((res) => {
-                        this.loadingFields = false;
-                        let fields = res.data;
+                        this.loadingMetadata = false;
+                        let metadata = res.data;
 
-                        if( fields.length > 0 ){
-                            this.fields = [];
+                        if( metadata.length > 0 ){
+                            this.metadata = [];
 
-                            for( let field of fields ){
-                               if( field.field_type !== "Tainacan\\Field_Types\\Relationship"){
-                                   this.fields.push( field );
-                                   this.hasFields = true;
-                                   this.checkFields()
+                            for( let metadatum of metadata ){
+                               if( metadatum.metadatum_type !== "Tainacan\\Metadatum_Types\\Relationship"){
+                                   this.metadata.push( metadatum );
+                                   this.hasMetadata = true;
+                                   this.checkMetadata()
                                }
                             }
 
                         } else {
-                            this.fields = [];
-                            this.hasFields = false;
+                            this.metadata = [];
+                            this.hasMetadata = false;
                             this.$toast.open({
                                 duration: 4000,
-                                message: this.$i18n.get('info_warning_no_fields_found'),
+                                message: this.$i18n.get('info_warning_no_metadata_found'),
                                 position: 'is-bottom',
                                 type: 'is-danger'
                             })
@@ -204,12 +204,12 @@
                         this.emitValues();
                     })
                     .catch(() => {
-                        this.hasFields = false;
+                        this.hasMetadata = false;
                         this.emitValues();
                     });
 
             },
-            checkFields(){
+            checkMetadata(){
                 if( this.value && this.value.search.length > 0 ){
                     this.modelSearch = this.value.search;
                 } else {
diff --git a/src/classes/field-types/relationship/Relationship.vue b/src/classes/metadatum-types/relationship/Relationship.vue
similarity index 74%
rename from src/classes/field-types/relationship/Relationship.vue
rename to src/classes/metadatum-types/relationship/Relationship.vue
index 1b9c81859..8a6e2cfd2 100644
--- a/src/classes/field-types/relationship/Relationship.vue
+++ b/src/classes/metadatum-types/relationship/Relationship.vue
@@ -4,7 +4,7 @@
                 :id="id"
                 v-model="selected"
                 :data="options"
-                :maxtags="field.field.multiple === 'yes' ? 100 : 1"
+                :maxtags="metadatum.metadatum.multiple === 'yes' ? 100 : 1"
                 autocomplete
                 attached
                 :loading="loading"
@@ -21,9 +21,9 @@
 
     export default {
         created(){
-            let collectionId = ( this.field && this.field.field.field_type_options.collection_id ) ? this.field.field.field_type_options.collection_id : this.collection_id;
-            if( this.field.value ){
-                let query = qs.stringify({ postin: ( Array.isArray( this.field.value ) ) ? this.field.value : [ this.field.value ]  });
+            let collectionId = ( this.metadatum && this.metadatum.metadatum.metadatum_type_options.collection_id ) ? this.metadatum.metadatum.metadatum_type_options.collection_id : this.collection_id;
+            if( this.metadatum.value ){
+                let query = qs.stringify({ postin: ( Array.isArray( this.metadatum.value ) ) ? this.metadatum.value : [ this.metadatum.value ]  });
 
                 axios.get('/collection/'+collectionId+'/items?' + query + '?nopaging=1')
                     .then( res => {
@@ -36,13 +36,13 @@
                     });
             }
 
-            if( this.field.field.field_type_options
-                    && this.field.field.field_type_options.search.length > 0){
-                axios.get('/collection/'+ collectionId +'/fields?context=edit')
+            if( this.metadatum.metadatum.metadatum_type_options
+                    && this.metadatum.metadatum.metadatum_type_options.search.length > 0){
+                axios.get('/collection/'+ collectionId +'/metadata?context=edit')
                     .then( res => {
                         for (let item of res.data) {
-                            if( this.field.field.field_type_options.search.indexOf( item.id ) >= 0 )
-                                this.searchFields.push( item );
+                            if( this.metadatum.metadatum.metadatum_type_options.search.indexOf( item.id ) >= 0 )
+                                this.searchMetadata.push( item );
                         }
                     })
                     .catch(error => {
@@ -58,13 +58,13 @@
                 loading: false,
                 collectionId: 0,
                 inputValue: null,
-                searchFields: [],
+                searchMetadata: [],
                 queryObject: {},
                 itemsFound: []
             }
         },
         props: {
-            field: {
+            metadatum: {
                 type: Object
             },
             collection_id: {
@@ -95,7 +95,7 @@
                 this.$emit('blur');
             },
             search(query){
-                if( this.selected.length > 0  && this.field.field.multiple === 'no'){
+                if( this.selected.length > 0  && this.metadatum.metadatum.multiple === 'no'){
                     return '';
                 }
 
@@ -103,7 +103,7 @@
                     let metaquery = this.mountQuery( query );
                     this.loading = true;
                     this.options = [];
-                    let collectionId = ( this.field && this.field.field.field_type_options.collection_id ) ? this.field.field.field_type_options.collection_id : this.collection_id;
+                    let collectionId = ( this.metadatum && this.metadatum.metadatum.metadatum_type_options.collection_id ) ? this.metadatum.metadatum.metadatum_type_options.collection_id : this.collection_id;
                     axios.get('/collection/'+collectionId+'/items?' + qs.stringify( metaquery ))
                     .then( res => {
                         this.loading = false;
@@ -122,13 +122,13 @@
             },
             mountQuery( search ){
                 let query = []
-                if( this.searchFields.length > 0){
+                if( this.searchMetadata.length > 0){
                     query['metaquery'] = [];
                     const metaquery = query['metaquery'];
                     metaquery['relation'] = 'OR'
-                    for( let index in this.searchFields ){
+                    for( let index in this.searchMetadata ){
                         metaquery[index] = {
-                            key: this.searchFields[index].id,
+                            key: this.searchMetadata[index].id,
                             value: search
                         }
                     }
diff --git a/src/classes/field-types/relationship/class-tainacan-relationship.php b/src/classes/metadatum-types/relationship/class-tainacan-relationship.php
similarity index 82%
rename from src/classes/field-types/relationship/class-tainacan-relationship.php
rename to src/classes/metadatum-types/relationship/class-tainacan-relationship.php
index b2711f068..d4b6b8423 100644
--- a/src/classes/field-types/relationship/class-tainacan-relationship.php
+++ b/src/classes/metadatum-types/relationship/class-tainacan-relationship.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Relationship extends Field_Type {
+class Relationship extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('item');
         $this->set_component('tainacan-relationship');
@@ -45,14 +45,14 @@ class Relationship extends Field_Type {
     public function render( $itemMetadata ){
         return '<tainacan-relationship 
                             collection_id="' . $this->get_options()['collection_id'] . '"
-                            field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                            metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                             item_id="'.$itemMetadata->get_item()->get_id().'"    
                             value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                            name="'.$itemMetadata->get_field()->get_name().'"></tainacan-relationship>';
+                            name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-relationship>';
     }
     
-    public function validate_options(\Tainacan\Entities\Field $field) {
-        if ( !in_array($field->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+    public function validate_options(\Tainacan\Entities\Metadatum $metadatum) {
+        if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
             return true;
 
         if (!empty($this->get_option('collection_id')) && !is_numeric($this->get_option('collection_id'))) {
@@ -68,7 +68,7 @@ class Relationship extends Field_Type {
     }
 	
 	/**
-	 * Return the value of an Item_Metadata_Entity using a field of this field type as an html string
+	 * Return the value of an Item_Metadata_Entity using a metadatum of this metadatum type as an html string
 	 * @param  Item_Metadata_Entity $item_metadata 
 	 * @return string The HTML representation of the value, containing one or multiple items names, linked to the item page
 	 */
diff --git a/src/classes/field-types/selectbox/FormSelectbox.vue b/src/classes/metadatum-types/selectbox/FormSelectbox.vue
similarity index 97%
rename from src/classes/field-types/selectbox/FormSelectbox.vue
rename to src/classes/metadatum-types/selectbox/FormSelectbox.vue
index 4747d613f..5387c36ad 100644
--- a/src/classes/field-types/selectbox/FormSelectbox.vue
+++ b/src/classes/metadatum-types/selectbox/FormSelectbox.vue
@@ -27,7 +27,7 @@
     export default {
         props: {
             value: [ String, Object, Array ],
-            field: [ String, Object ],
+            metadatum: [ String, Object ],
             errors: [ String, Object, Array ]
         },
         data() {
diff --git a/src/classes/field-types/selectbox/Selectbox.vue b/src/classes/metadatum-types/selectbox/Selectbox.vue
similarity index 83%
rename from src/classes/field-types/selectbox/Selectbox.vue
rename to src/classes/metadatum-types/selectbox/Selectbox.vue
index c4699eae0..ebbc9343b 100644
--- a/src/classes/field-types/selectbox/Selectbox.vue
+++ b/src/classes/metadatum-types/selectbox/Selectbox.vue
@@ -30,7 +30,7 @@
             }
         },
         props: {
-            field: {
+            metadatum: {
                 type: Object
             },
             options: {
@@ -44,9 +44,9 @@
                 if ( this.options && this.options !== '' ){
                     return this.options.split("\n");
                 }
-                else if ( this.field && this.field.field.field_type_options.options ) {
-                    const fields = this.field.field.field_type_options.options;
-                    return ( fields ) ? fields.split("\n") : [];
+                else if ( this.metadatum && this.metadatum.metadatum.metadatum_type_options.options ) {
+                    const metadata = this.metadatum.metadatum.metadatum_type_options.options;
+                    return ( metadata ) ? metadata.split("\n") : [];
                 }
                 return [];
             }
diff --git a/src/classes/field-types/selectbox/class-tainacan-selectbox.php b/src/classes/metadatum-types/selectbox/class-tainacan-selectbox.php
similarity index 72%
rename from src/classes/field-types/selectbox/class-tainacan-selectbox.php
rename to src/classes/metadatum-types/selectbox/class-tainacan-selectbox.php
index 055bf820f..ef88a9592 100644
--- a/src/classes/field-types/selectbox/class-tainacan-selectbox.php
+++ b/src/classes/metadatum-types/selectbox/class-tainacan-selectbox.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Selectbox extends Field_Type {
+class Selectbox extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('string');
         $this->set_component('tainacan-selectbox');
@@ -37,18 +37,18 @@ class Selectbox extends Field_Type {
         $options = $this->get_option('options');
         return '<tainacan-selectbox    
                                        options="' . $options . '"
-                                       field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                                       metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                        item_id="'.$itemMetadata->get_item()->get_id().'"    
                                        value=\''.json_encode( $itemMetadata->get_value() ).'\'
-                                       name="'.$itemMetadata->get_field()->get_name().'"></tainacan-selectbox>';
+                                       name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-selectbox>';
     }
 
     /**
-     * @param \Tainacan\Entities\Field $field
+     * @param \Tainacan\Entities\Metadatum $metadatum
      * @return array|bool true if is validate or array if has error
      */
-    public function validate_options(\Tainacan\Entities\Field $field) {
-        if ( !in_array($field->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+    public function validate_options(\Tainacan\Entities\Metadatum $metadatum) {
+        if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
             return true;
 
         if ( empty($this->get_option('options')) ) {
diff --git a/src/classes/field-types/tainacan-form-item.vue b/src/classes/metadatum-types/tainacan-form-item.vue
similarity index 58%
rename from src/classes/field-types/tainacan-form-item.vue
rename to src/classes/metadatum-types/tainacan-form-item.vue
index c09ccb15a..8bfd74bc0 100644
--- a/src/classes/field-types/tainacan-form-item.vue
+++ b/src/classes/metadatum-types/tainacan-form-item.vue
@@ -2,43 +2,43 @@
     <b-field
             :addons="false"
             :message="getErrorMessage"
-            :type="fieldTypeMessage">
+            :type="metadatumTypeMessage">
         <span   
                 class="collapse-handle"
-                @click="$emit('changeCollapse', fieldTypeMessage != 'is-danger' ? !isCollapsed : true)">
+                @click="$emit('changeCollapse', metadatumTypeMessage != 'is-danger' ? !isCollapsed : true)">
             <b-icon 
                     type="is-secondary"
-                    :icon="isCollapsed || fieldTypeMessage == 'is-danger' ? 'menu-down' : 'menu-right'" />
-            <label class="label">{{ field.field.name }}</label>
+                    :icon="isCollapsed || metadatumTypeMessage == 'is-danger' ? 'menu-down' : 'menu-right'" />
+            <label class="label">{{ metadatum.metadatum.name }}</label>
             <span
-                    v-if="field.field.required == 'yes'" 
-                    class="required-field-asterisk" 
-                    :class="fieldTypeMessage">*</span>
-            <span class="field-type">({{ $i18n.get(field.field.field_type_object.component) }})</span>      
+                    v-if="metadatum.metadatum.required == 'yes'"
+                    class="required-metadatum-asterisk"
+                    :class="metadatumTypeMessage">*</span>
+            <span class="metadatum-type">({{ $i18n.get(metadatum.metadatum.metadatum_type_object.component) }})</span>
             <help-button 
-                    :title="field.field.name" 
-                    :message="field.field.description"/>
+                    :title="metadatum.metadatum.name"
+                    :message="metadatum.metadatum.description"/>
         </span>
         <div   
-                v-show="isCollapsed || fieldTypeMessage == 'is-danger'" 
-                v-if="isTextInputComponent( field.field.field_type_object.component )">
+                v-show="isCollapsed || metadatumTypeMessage == 'is-danger'"
+                v-if="isTextInputComponent( metadatum.metadatum.metadatum_type_object.component )">
             <component 
-                    :id="field.field.field_type_object.component + '-' + field.field.slug" 
-                    :is="field.field.field_type_object.component" 
+                    :id="metadatum.metadatum.metadatum_type_object.component + '-' + metadatum.metadatum.slug"
+                    :is="metadatum.metadatum.metadatum_type_object.component"
                     v-model="inputs[0]" 
-                    :field="field" 
+                    :metadatum="metadatum"
                     @blur="changeValue()"/>
-            <div v-if="field.field.multiple == 'yes'">
+            <div v-if="metadatum.metadatum.multiple == 'yes'">
                 <div 
                         v-if="index > 0" 
                         v-for="(input, index) in inputsList " 
                         :key="index" 
                         class="multiple-inputs">
                     <component 
-                            :id="field.field.field_type_object.component + '-' + field.field.slug" 
-                            :is="field.field.field_type_object.component" 
+                            :id="metadatum.metadatum.metadatum_type_object.component + '-' + metadatum.metadatum.slug"
+                            :is="metadatum.metadatum.metadatum_type_object.component"
                             v-model="inputs[index]" 
-                            :field="field" 
+                            :metadatum="metadatum"
                             @blur="changeValue()"/><a 
                             class="button" 
                             v-if="index > 0" 
@@ -53,10 +53,10 @@
                 v-show="isCollapsed"
                 v-else>
             <component
-                    :id="field.field.field_type_object.component + '-' + field.field.slug"
-                    :is="field.field.field_type_object.component" 
+                    :id="metadatum.metadatum.metadatum_type_object.component + '-' + metadatum.metadatum.slug"
+                    :is="metadatum.metadatum.metadatum_type_object.component"
                     v-model="inputs"
-                    :field="field" 
+                    :metadatum="metadatum"
                     @blur="changeValue()"/>
         </div>
     </b-field>
@@ -68,15 +68,15 @@
     export default {
         name: 'TainacanFormItem',
         props: {
-            field: {
+            metadatum: {
                 type: Object
             },
-            isCollapsed: true // Field Collapses
+            isCollapsed: true // Metadatum Collapses
         },
         data(){
             return {
                 inputs: [],
-                fieldTypeMessage:''
+                metadatumTypeMessage:''
             }
         },
         computed: {
@@ -86,10 +86,10 @@
             getErrorMessage() {
                 
                 let msg = '';
-                let errors = eventBus.getErrors(this.field.field.id);
+                let errors = eventBus.getErrors(this.metadatum.metadatum.id);
 
                 if ( errors) {
-                    this.setFieldTypeMessage('is-danger');
+                    this.setMetadatumTypeMessage('is-danger');
                     for (let error of errors) { 
                         for (let index of Object.keys(error)) {
                             // this.$console.log(index);
@@ -97,7 +97,7 @@
                         }
                     }
                 } else {
-                    this.setFieldTypeMessage('');
+                    this.setMetadatumTypeMessage('');
                 }
 
                 return msg;
@@ -108,15 +108,15 @@
         },
         methods: {
             changeValue(){
-                eventBus.$emit('input', { item_id: this.field.item.id, field_id: this.field.field.id, values: this.inputs } );
+                eventBus.$emit('input', { item_id: this.metadatum.item.id, metadatum_id: this.metadatum.metadatum.id, values: this.inputs } );
             },
             getValue(){           
-                if (this.field.value instanceof Array) {
-                    this.inputs = this.field.value;
+                if (this.metadatum.value instanceof Array) {
+                    this.inputs = this.metadatum.value;
                     if (this.inputs.length === 0)
                         this.inputs.push('');
                 } else {
-                    this.field.value == null || this.field.value == undefined ? this.inputs.push('') : this.inputs.push(this.field.value);
+                    this.metadatum.value == null || this.metadatum.value == undefined ? this.inputs.push('') : this.inputs.push(this.metadatum.value);
                 }
             },
             addInput(){
@@ -131,8 +131,8 @@
                 let array = ['tainacan-relationship','tainacan-category'];
                 return !( array.indexOf( component ) >= 0 );
             },
-            setFieldTypeMessage( message ){
-                this.fieldTypeMessage = message;
+            setMetadatumTypeMessage( message ){
+                this.metadatumTypeMessage = message;
             }
         }
     }
@@ -156,7 +156,7 @@
             margin-left: 18px;
             margin-bottom: 0.5em;
         }
-        .field-type {
+        .metadatum-type {
             font-size: 13px;
             font-weight: 400;
             color: $gray;
diff --git a/src/classes/field-types/text/Text.vue b/src/classes/metadatum-types/text/Text.vue
similarity index 96%
rename from src/classes/field-types/text/Text.vue
rename to src/classes/metadatum-types/text/Text.vue
index e2c4174fb..1cac2722b 100644
--- a/src/classes/field-types/text/Text.vue
+++ b/src/classes/metadatum-types/text/Text.vue
@@ -20,7 +20,7 @@
             }
         },
         props: {
-            field: {
+            metadatum: {
                 type: Object
             },
             value: [String, Number, Array],
diff --git a/src/classes/field-types/text/class-tainacan-text.php b/src/classes/metadatum-types/text/class-tainacan-text.php
similarity index 63%
rename from src/classes/field-types/text/class-tainacan-text.php
rename to src/classes/metadatum-types/text/class-tainacan-text.php
index 814bebfa6..cee0f0c4b 100644
--- a/src/classes/field-types/text/class-tainacan-text.php
+++ b/src/classes/metadatum-types/text/class-tainacan-text.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Text extends Field_Type {
+class Text extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         parent::set_primitive_type('string');
         parent::set_component('tainacan-text');
@@ -22,9 +22,9 @@ class Text extends Field_Type {
      */
 
     public function render( $itemMetadata ){
-        return '<tainacan-text field_id ="'.$itemMetadata->get_field()->get_id().'" 
+        return '<tainacan-text metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                                item_id="'.$itemMetadata->get_item()->get_id().'"    
                                value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                               name="'.$itemMetadata->get_field()->get_name().'"></tainacan-text>';
+                               name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-text>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/field-types/textarea/Textarea.vue b/src/classes/metadatum-types/textarea/Textarea.vue
similarity index 97%
rename from src/classes/field-types/textarea/Textarea.vue
rename to src/classes/metadatum-types/textarea/Textarea.vue
index bab454957..5a92d3c60 100644
--- a/src/classes/field-types/textarea/Textarea.vue
+++ b/src/classes/metadatum-types/textarea/Textarea.vue
@@ -23,7 +23,7 @@
         },
         props: {
             id: '',
-            field: {
+            metadatum: {
                 type: Object
             },
             value: [String, Number, Array],
diff --git a/src/classes/field-types/textarea/class-tainacan-textarea.php b/src/classes/metadatum-types/textarea/class-tainacan-textarea.php
similarity index 65%
rename from src/classes/field-types/textarea/class-tainacan-textarea.php
rename to src/classes/metadatum-types/textarea/class-tainacan-textarea.php
index ce3c70c71..7b46bbb5c 100644
--- a/src/classes/field-types/textarea/class-tainacan-textarea.php
+++ b/src/classes/metadatum-types/textarea/class-tainacan-textarea.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tainacan\Field_Types;
+namespace Tainacan\Metadatum_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class Textarea extends Field_Type {
+class Textarea extends Metadatum_Type {
 
     function __construct(){
-        // call field type constructor
+        // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('string');
         $this->set_component('tainacan-textarea');
@@ -23,9 +23,9 @@ class Textarea extends Field_Type {
 
     public function render( $itemMetadata ){
         return '<tainacan-textarea 
-                        field_id ="'.$itemMetadata->get_field()->get_id().'" 
+                        metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'" 
                         item_id="'.$itemMetadata->get_item()->get_id().'"    
                         value=\''.json_encode( $itemMetadata->get_value() ).'\'  
-                        name="'.$itemMetadata->get_field()->get_name().'"></tainacan-textarea>';
+                        name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-textarea>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/repositories/class-tainacan-collections.php b/src/classes/repositories/class-tainacan-collections.php
index 9cce3639c..f9dae659c 100644
--- a/src/classes/repositories/class-tainacan-collections.php
+++ b/src/classes/repositories/class-tainacan-collections.php
@@ -113,7 +113,7 @@ class Collections extends Repository {
 				'default'     => 'ASC',
 				'validation'  => v::stringType()->in( [ 'ASC', 'DESC' ] ),
 			],
-			'default_displayed_fields' => [
+			'default_displayed_metadata' => [
 				'map'         => 'meta',
 				'title'       => __( 'Default Displayed Metadata', 'tainacan' ),
 				'type'        => 'array/object/string',
@@ -138,7 +138,7 @@ class Collections extends Repository {
 				'default'     => [],
 				//'validation' => v::stringType(),
 			],
-			'fields_order'             => [
+			'metadata_order'             => [
 				'map'         => 'meta',
 				'title'       => __( 'Ordination metadata', 'tainacan' ),
 				'type'        => 'array/object/string',
@@ -259,12 +259,12 @@ class Collections extends Repository {
 	 * @see \Tainacan\Repositories\Repository::insert()
 	 */
 	public function insert( $collection ) {
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
 		$this->pre_update_moderators( $collection );
 		$new_collection = parent::insert( $collection );
 
-		$Tainacan_Fields->register_core_fields( $new_collection );
+		$Tainacan_Metadata->register_core_metadata( $new_collection );
 		$collection->register_collection_item_post_type();
 		flush_rewrite_rules(false); // needed to activate items post type archive url
 		$this->update_moderators( $new_collection );
diff --git a/src/classes/repositories/class-tainacan-filters.php b/src/classes/repositories/class-tainacan-filters.php
index ece28938d..80fb4f073 100644
--- a/src/classes/repositories/class-tainacan-filters.php
+++ b/src/classes/repositories/class-tainacan-filters.php
@@ -78,7 +78,7 @@ class Filters extends Repository {
                 'description'=> __('Filter color', 'tainacan'),
                 'validation' => ''
             ],
-            'field'               => [
+            'metadatum'               => [
                 'map'        => 'meta',
                 'title'      => __('Metadata', 'tainacan'),
                 'type'       => 'integer',
@@ -128,7 +128,7 @@ class Filters extends Repository {
             'can_export'          => true,
             'rewrite'             => true,
         	'map_meta_cap'		  => true,
-        	'capability_type'     => Entities\Field::get_capability_type(),
+        	'capability_type'     => Entities\Metadatum::get_capability_type(),
             'supports'            => [
                 'title',
                 'editor',
@@ -140,30 +140,30 @@ class Filters extends Repository {
 
 
     /**
-     * @param Entities\Field $field
+     * @param Entities\Metadatum $metadatum
      * @return int
      *
-    public function insert($field) {
+    public function insert($metadatum) {
         // First iterate through the native post properties
         $map = $this->get_map();
         foreach ($map as $prop => $mapped) {
             if ($mapped['map'] != 'meta' && $mapped['map'] != 'meta_multi') {
-                $field->WP_Post->{$mapped['map']} = $field->get_mapped_property($prop);
+                $metadatum->WP_Post->{$mapped['map']} = $metadatum->get_mapped_property($prop);
             }
         }
 
         // save post and get its ID
-        $field->WP_Post->post_type = Entities\Filter::get_post_type();
-        $field->WP_Post->post_status = 'publish';
-        $id = wp_insert_post($field->WP_Post);
-        $field->WP_Post = get_post($id);
+        $metadatum->WP_Post->post_type = Entities\Filter::get_post_type();
+        $metadatum->WP_Post->post_status = 'publish';
+        $id = wp_insert_post($metadatum->WP_Post);
+        $metadatum->WP_Post = get_post($id);
 
         // Now run through properties stored as postmeta
         foreach ($map as $prop => $mapped) {
             if ($mapped['map'] == 'meta') {
-                update_post_meta($id, $prop, $field->get_mapped_property($prop));
+                update_post_meta($id, $prop, $metadatum->get_mapped_property($prop));
             } elseif ($mapped['map'] == 'meta_multi') {
-                $values = $field->get_mapped_property($prop);
+                $values = $metadatum->get_mapped_property($prop);
 
                 delete_post_meta($id, $prop);
 
@@ -176,7 +176,7 @@ class Filters extends Repository {
         }
 
         // return a brand new object
-        return new Entities\Filter($field->WP_Post);
+        return new Entities\Filter($metadatum->WP_Post);
     }*/
 
     /**
@@ -249,7 +249,7 @@ class Filters extends Repository {
 
 
     /**
-     * register field types class on array of types
+     * register metadatum types class on array of types
      *
      * @param $class_name string | object The class name or the instance
      */
@@ -264,7 +264,7 @@ class Filters extends Repository {
     }
 
     /**
-     * register field types class on array of types
+     * register metadatum types class on array of types
      *
      * @param $class_name string | object The class name or the instance
      */
@@ -308,7 +308,7 @@ class Filters extends Repository {
     /**
      * fetch only supported filters for the type specified
      *
-     * @param ( string || array )  $types Primitve types of field ( float, string, int)
+     * @param ( string || array )  $types Primitve types of metadatum ( float, string, int)
      * @return array Filters supported by the primitive types passed in $types
      */
     public function fetch_supported_filter_types($types){
@@ -336,10 +336,10 @@ class Filters extends Repository {
      * fetch filters by collection, searches all filters available
      *
      * @param Entities\Collection $collection
-     * @param array $args WP_Query args plus disabled_fields
+     * @param array $args WP_Query args plus disabled_metadata
      * @param string $output The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
      *
-     * @return array Entities\Field
+     * @return array Entities\Metadatum
      * @throws \Exception
      */
     public function fetch_by_collection(Entities\Collection $collection, $args = [], $output = null){
@@ -351,7 +351,7 @@ class Filters extends Repository {
         //insert the actual collection
         $parents[] = $collection_id;
 
-        //search for default field
+        //search for default metadatum
         //$parents[] = $this->get_default_metadata_attribute();
 
         $meta_query = array(
@@ -397,7 +397,7 @@ class Filters extends Repository {
 
                     if( $index !== false ) {
 
-	                    // skipping fields disabled if the arg is set
+	                    // skipping metadata disabled if the arg is set
 	                    if ( ! $include_disabled && isset( $order[ $index ]['enabled'] ) && ! $order[ $index ]['enabled'] ) {
 		                    continue;
 	                    }
diff --git a/src/classes/repositories/class-tainacan-item-metadata.php b/src/classes/repositories/class-tainacan-item-metadata.php
index 01d54dbe3..e360c2b85 100644
--- a/src/classes/repositories/class-tainacan-item-metadata.php
+++ b/src/classes/repositories/class-tainacan-item-metadata.php
@@ -47,13 +47,13 @@ class Item_Metadata extends Repository {
 		
 		$unique = !$item_metadata->is_multiple();
 
-		$field_type = $item_metadata->get_field()->get_field_type_object();
-		if ($field_type->get_core()) {
-			$this->save_core_field_value($item_metadata);
-		} elseif ($field_type->get_primitive_type() == 'term') {
-			$this->save_terms_field_value($item_metadata);
-		} elseif ($field_type->get_primitive_type() == 'compound') {
-			// do nothing. Compound values are updated when its child fields are updated
+		$metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object();
+		if ($metadatum_type->get_core()) {
+			$this->save_core_metadatum_value($item_metadata);
+		} elseif ($metadatum_type->get_primitive_type() == 'term') {
+			$this->save_terms_metadatum_value($item_metadata);
+		} elseif ($metadatum_type->get_primitive_type() == 'compound') {
+			// do nothing. Compound values are updated when its child metadata are updated
 			return $item_metadata;
 		} else {
 			if ($unique) {
@@ -63,28 +63,28 @@ class Item_Metadata extends Repository {
 				} else {
 					
 					/**
-					 * When we are adding a field that is child of another, this means it is inside a compound field 
+					 * When we are adding a metadatum that is child of another, this means it is inside a compound metadatum
 					 *
 					 * In that case, if the Item_Metadata object is not set with a meta_id, it means we want to create a new one 
-					 * and not update an existing. This is the case of a multiple compound field.
+					 * and not update an existing. This is the case of a multiple compound metadatum.
 					 */
-					if ( $item_metadata->get_field()->get_parent() > 0 && is_null($item_metadata->get_meta_id()) ) {
-						$added_meta_id = add_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_id(), wp_slash( $item_metadata->get_value() ) );
+					if ( $item_metadata->get_metadatum()->get_parent() > 0 && is_null($item_metadata->get_meta_id()) ) {
+						$added_meta_id = add_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id(), wp_slash( $item_metadata->get_value() ) );
 						$added_compound = $this->add_compound_value($item_metadata, $added_meta_id);
 					} else {
-						update_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_id(), wp_slash( $item_metadata->get_value() ) );
+						update_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id(), wp_slash( $item_metadata->get_value() ) );
 					}
 					
 				}
 				
 	        } else {
-	            delete_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_id());
+	            delete_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id());
 	            
 	            if (is_array($item_metadata->get_value())){
 	            	$values = $item_metadata->get_value();
 
 	                foreach ($values as $value){
-	                    add_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_id(), wp_slash( $value ));
+	                    add_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id(), wp_slash( $value ));
 	                }
 	            }
 	        }
@@ -93,7 +93,7 @@ class Item_Metadata extends Repository {
 			do_action('tainacan-insert-Item_Metadata_Entity', $item_metadata);
 		}
 
-        $new_entity = new Entities\Item_Metadata_Entity($item_metadata->get_item(), $item_metadata->get_field());
+        $new_entity = new Entities\Item_Metadata_Entity($item_metadata->get_item(), $item_metadata->get_metadatum());
 		
 		if (isset($added_compound) && is_int($added_compound)) {
 			$new_entity->set_parent_meta_id($added_compound);
@@ -114,14 +114,14 @@ class Item_Metadata extends Repository {
 	 */
 	public function delete($item_metadata){}
 
-    public function save_core_field_value(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) {
-        $field_type = $item_metadata->get_field()->get_field_type_object();
-        if ($field_type->get_core()) {
+    public function save_core_metadatum_value(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) {
+        $metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object();
+        if ($metadatum_type->get_core()) {
             $item = $item_metadata->get_item();
-            $set_method = 'set_' . $field_type->get_related_mapped_prop();
+            $set_method = 'set_' . $metadatum_type->get_related_mapped_prop();
             $value = $item_metadata->get_value();
             $item->$set_method( is_array( $value ) ? $value[0] : $value );
-            if ($item->validate_core_fields()) {
+            if ($item->validate_core_metadata()) {
                 $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
                 $Tainacan_Items->insert($item);
             } else {
@@ -130,11 +130,11 @@ class Item_Metadata extends Repository {
         }
     }
 	
-	public function save_terms_field_value($item_metadata) {
-		$field_type = $item_metadata->get_field()->get_field_type_object();
-		if ($field_type->get_primitive_type() == 'term') {
+	public function save_terms_metadatum_value($item_metadata) {
+		$metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object();
+		if ($metadatum_type->get_primitive_type() == 'term') {
 			$new_terms = $item_metadata->get_value();
-			$taxonomy = new Entities\Taxonomy( $field_type->get_option('taxonomy_id') );
+			$taxonomy = new Entities\Taxonomy( $metadatum_type->get_option('taxonomy_id') );
 
 			if( $taxonomy ){
 				$old = $item_metadata;
@@ -170,15 +170,15 @@ class Item_Metadata extends Repository {
 		
 		if ( $item_metadata->get_parent_meta_id() > 0 ) {
 			update_metadata_by_mid( 'post', $item_metadata->get_parent_meta_id(), $current_value );
-		} elseif ( $item_metadata->get_field()->get_parent() > 0 ) {
-			return add_post_meta( $item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_parent(), $current_value );
+		} elseif ( $item_metadata->get_metadatum()->get_parent() > 0 ) {
+			return add_post_meta( $item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_parent(), $current_value );
 		}
 		
 		
 	}
 
 	/**
-	 * Fetch Item Field objects related to an Item
+	 * Fetch Item Metadatum objects related to an Item
 	 *
 	 * @param Entities\Item $object
 	 *
@@ -187,7 +187,7 @@ class Item_Metadata extends Repository {
 	 */
     public function fetch($object, $output = null, $args = [] ){
         if($object instanceof Entities\Item){
-            $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+            $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
             
             $collection = $object->get_collection();
             
@@ -195,7 +195,7 @@ class Item_Metadata extends Repository {
                 return [];
             }
             
-            $meta_list = $Tainacan_Fields->fetch_by_collection($collection, $args, 'OBJECT' );
+            $meta_list = $Tainacan_Metadata->fetch_by_collection($collection, $args, 'OBJECT' );
             
             $return = [];
             
@@ -212,7 +212,7 @@ class Item_Metadata extends Repository {
     }
 
 	/**
-	 * Get the value for a Item field.
+	 * Get the value for a Item metadatum.
 	 *
 	 * @param Entities\Item_Metadata_Entity $item_metadata
 	 *
@@ -222,17 +222,17 @@ class Item_Metadata extends Repository {
     public function get_value(Entities\Item_Metadata_Entity $item_metadata) {
         $unique = ! $item_metadata->is_multiple();
         
-        $field_type = $item_metadata->get_field()->get_field_type_object();
-        if ($field_type->get_core()) {
+        $metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object();
+        if ($metadatum_type->get_core()) {
             $item = $item_metadata->get_item();
             
-            $get_method = 'get_' . $field_type->get_related_mapped_prop();
+            $get_method = 'get_' . $metadatum_type->get_related_mapped_prop();
             return $item->$get_method();
         
-		} elseif ($field_type->get_primitive_type() == 'term') {
+		} elseif ($metadatum_type->get_primitive_type() == 'term') {
 
-            if( is_numeric( $field_type->get_option('taxonomy_id') ) ){
-                $taxonomy = new Entities\Taxonomy( $field_type->get_option('taxonomy_id') );
+            if( is_numeric( $metadatum_type->get_option('taxonomy_id') ) ){
+                $taxonomy = new Entities\Taxonomy( $metadatum_type->get_option('taxonomy_id') );
                 if( $taxonomy ){
                     $taxonomy_slug = $taxonomy->get_db_identifier();
                 } else {
@@ -262,11 +262,11 @@ class Item_Metadata extends Repository {
 			
 			return $terms;
 		
-		} elseif ($field_type->get_primitive_type() == 'compound') {
+		} elseif ($metadatum_type->get_primitive_type() == 'compound') {
 			
 			global $wpdb;
 			$rows = $wpdb->get_results( 
-				$wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_id()), 
+				$wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id()),
 				ARRAY_A );
 			
 			$return_value = [];
@@ -294,7 +294,7 @@ class Item_Metadata extends Repository {
 					return $value->meta_value;
 				}
 			} else {
-				return get_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_field()->get_id(), $unique);
+				return get_post_meta($item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id(), $unique);
 			}
 			
         }
@@ -302,7 +302,7 @@ class Item_Metadata extends Repository {
     }
 
 	/**
-	 * Transforms the array saved as meta_value with the IDs of post_meta saved as a value for compound fields
+	 * Transforms the array saved as meta_value with the IDs of post_meta saved as a value for compound metadata
 	 * and converts it into an array of Item Metadatada Entitites
 	 *
 	 * @param array $ids The array of post_meta ids
@@ -320,8 +320,8 @@ class Item_Metadata extends Repository {
 			foreach ($ids as $id) {
 				$post_meta_object = get_metadata_by_mid( 'post', $id );
 				if ( is_object($post_meta_object) ) {
-					$field = new Entities\Field($post_meta_object->meta_key);
-					$return_value[$field->get_id()] = new Entities\Item_Metadata_Entity( $item, $field, $id, $compund_meta_id );
+					$metadatum = new Entities\Metadatum($post_meta_object->meta_key);
+					$return_value[$metadatum->get_id()] = new Entities\Item_Metadata_Entity( $item, $metadatum, $id, $compund_meta_id );
 				}
 				
 			}
@@ -346,7 +346,7 @@ class Item_Metadata extends Repository {
 	}
 
     /**
-     * Suggest a value to be inserted as a item Field value, return a pending log  
+     * Suggest a value to be inserted as a item Metadatum value, return a pending log
      * @param Entities\Item_Metadata_Entity $item_metadata
      * @return Entities\Log
      */        
diff --git a/src/classes/repositories/class-tainacan-items.php b/src/classes/repositories/class-tainacan-items.php
index ed2e5601f..3ab7a0ebc 100644
--- a/src/classes/repositories/class-tainacan-items.php
+++ b/src/classes/repositories/class-tainacan-items.php
@@ -274,7 +274,7 @@ class Items extends Repository {
 	 */
 	public function fetch_ids( $args = [], $collections = [] ) {
 		
-		$args['fields'] = 'ids';
+		$args['metadata'] = 'ids';
 		
 		return $this->fetch( $args, $collections )->get_posts();
 	}
diff --git a/src/classes/repositories/class-tainacan-logs.php b/src/classes/repositories/class-tainacan-logs.php
index 8f4b77119..15b4f51ab 100644
--- a/src/classes/repositories/class-tainacan-logs.php
+++ b/src/classes/repositories/class-tainacan-logs.php
@@ -292,10 +292,10 @@ class Logs extends Repository {
 				return false;
 			}
 
-			if ( $new_value instanceof Entities\Field ) {
-				$type = $new_value->get_field_type();
+			if ( $new_value instanceof Entities\Metadatum ) {
+				$type = $new_value->get_metadatum_type();
 
-				if ( $type === 'Tainacan\Field_Types\Core_Title' || $type === 'Tainacan\Field_Types\Core_Description' ) {
+				if ( $type === 'Tainacan\Metadatum_Types\Core_Title' || $type === 'Tainacan\Metadatum_Types\Core_Description' ) {
 					return false;
 				}
 			}
@@ -304,7 +304,7 @@ class Logs extends Repository {
 			$class_name = explode( '\\', $type )[2];
 
 			$name = method_exists( $new_value, 'get_name' ) ? $new_value->get_name() :
-				( method_exists( $new_value, 'get_title' ) ? $new_value->get_title() : $new_value->get_field()->get_name() );
+				( method_exists( $new_value, 'get_title' ) ? $new_value->get_title() : $new_value->get_metadatum()->get_name() );
 
 			if ( ! $name ) {
 				$name = $new_value->get_status();
@@ -364,7 +364,7 @@ class Logs extends Repository {
 	 * @return string
 	 */
 	private function prepare_event_message($object, $name, $class_name, $action_message){
-		if ( $object instanceof Entities\Field || $object instanceof Entities\Item || $object instanceof Entities\Filter) {
+		if ( $object instanceof Entities\Metadatum || $object instanceof Entities\Item || $object instanceof Entities\Filter) {
 			$collection = $object->get_collection();
 			$parent     = $collection;
 
diff --git a/src/classes/repositories/class-tainacan-fields.php b/src/classes/repositories/class-tainacan-metadata.php
similarity index 72%
rename from src/classes/repositories/class-tainacan-fields.php
rename to src/classes/repositories/class-tainacan-metadata.php
index 19ce5f56a..86000fad0 100644
--- a/src/classes/repositories/class-tainacan-fields.php
+++ b/src/classes/repositories/class-tainacan-metadata.php
@@ -7,17 +7,17 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
 use \Respect\Validation\Validator as v;
 /**
- * Class Fields
+ * Class Metadata
  */
-class Fields extends Repository {
-	public $entities_type = '\Tainacan\Entities\Field';
+class Metadata extends Repository {
+	public $entities_type = '\Tainacan\Entities\Metadatum';
 	protected $default_metadata = 'default';
 
-	public $field_types = [];
+	public $metadatum_types = [];
 
-	public $core_fields = [
-	    'Tainacan\Field_Types\Core_Title',
-	    'Tainacan\Field_Types\Core_Description'
+	public $core_metadata = [
+	    'Tainacan\Metadatum_Types\Core_Title',
+	    'Tainacan\Metadatum_Types\Core_Description'
     ];
 
     private static $instance = null;
@@ -31,12 +31,12 @@ class Fields extends Repository {
     }
 
     /**
-     * Register specific hooks for field repository
+     * Register specific hooks for metadatum repository
      */
     protected function __construct() {
         parent::__construct();
-        add_filter('pre_trash_post', array( &$this, 'disable_delete_core_fields' ), 10, 2 );
-        add_filter('pre_delete_post', array( &$this, 'force_delete_core_fields' ), 10, 3 );
+        add_filter('pre_trash_post', array( &$this, 'disable_delete_core_metadata' ), 10, 2 );
+        add_filter('pre_delete_post', array( &$this, 'force_delete_core_metadata' ), 10, 3 );
     }
 	
     public function get_map() {
@@ -82,7 +82,7 @@ class Fields extends Repository {
 			    //'on_error'   => __('The description should be a text value', 'tainacan'),
 			    //'validation' => v::stringType()->notEmpty(),
 		    ],
-		    'field_type'         => [
+		    'metadatum_type'         => [
 			    'map'         => 'meta',
 			    'title'       => __( 'Type', 'tainacan' ),
 			    'type'        => 'string',
@@ -141,7 +141,7 @@ class Fields extends Repository {
 			    'type'        => 'string',
 			    'description' => __( 'The default value for the metadata', 'tainacan' ),
 		    ],
-		    'field_type_options' => [ // not showed in form
+		    'metadatum_type_options' => [ // not showed in form
 			    'map'         => 'meta',
 			    'title'       => __( 'Metadata type options', 'tainacan' ),
 			    'type'        => 'array/object/string',
@@ -225,18 +225,18 @@ class Fields extends Repository {
             'can_export'          => true,
             'rewrite'             => true,
         	'map_meta_cap'		  => true,
-        	'capability_type'	  => Entities\Field::get_capability_type(),
+        	'capability_type'	  => Entities\Metadatum::get_capability_type(),
             'supports'            => [
                 'title',
                 'editor',
                 'page-attributes'
             ]
         );
-        register_post_type(Entities\Field::get_post_type(), $args);
+        register_post_type(Entities\Metadatum::get_post_type(), $args);
     }
 
     /**
-     * constant used in default field in attribute collection_id
+     * constant used in default metadatum in attribute collection_id
      *
      * @return string the value of constant
      */
@@ -245,52 +245,52 @@ class Fields extends Repository {
     }
 
     /**
-     * register field types class on array of types
+     * register metadatum types class on array of types
      *
      * @param $class_name string | object The class name or the instance
      */
-    public function register_field_type( $class_name ){
+    public function register_metadatum_type( $class_name ){
         
-		// TODO: we shoud not allow registration of field types of retricted core field types (e.g. compound, term) by plugins
+		// TODO: we shoud not allow registration of metadatum types of retricted core metadatum types (e.g. compound, term) by plugins
 		
 		if( is_object( $class_name ) ){
             $class_name = get_class( $class_name );
         }
 
-        if(!in_array( $class_name, $this->field_types)){
-            $this->field_types[] = $class_name;
+        if(!in_array( $class_name, $this->metadatum_types)){
+            $this->metadatum_types[] = $class_name;
         }
     }
 
     /**
-     * register field types class on array of types
+     * register metadatum types class on array of types
      *
      * @param $class_name string | object The class name or the instance
      */
-    public function unregister_field_type( $class_name ){
+    public function unregister_metadatum_type( $class_name ){
         if( is_object( $class_name ) ){
             $class_name = get_class( $class_name );
         }
 
-        $key = array_search( $class_name, $this->field_types );
+        $key = array_search( $class_name, $this->metadatum_types );
         if($key !== false){
-            unset( $this->field_types[$key] );
+            unset( $this->metadatum_types[$key] );
         }
     }
 
 
 	/**
-	 * fetch field based on ID or WP_Query args
+	 * fetch metadatum based on ID or WP_Query args
 	 *
-	 * field are stored as posts. Check WP_Query docs
+	 * metadatum are stored as posts. Check WP_Query docs
 	 * to learn all args accepted in the $args parameter (@see https://developer.wordpress.org/reference/classes/wp_query/)
 	 * You can also use a mapped property, such as name and description, as an argument and it will be mapped to the
 	 * appropriate WP_Query argument
 	 *
-	 * @param array $args WP_Query args || int $args the field id
+	 * @param array $args WP_Query args || int $args the metadatum id
 	 * @param string $output The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
 	 *
-	 * @return Entities\Field|\WP_Query|Array an instance of wp query OR array of entities;
+	 * @return Entities\Metadatum|\WP_Query|Array an instance of wp query OR array of entities;
 	 * @throws \Exception
 	 */
     public function fetch( $args, $output = null ) {
@@ -298,7 +298,7 @@ class Fields extends Repository {
         if( is_numeric($args) ){
             $existing_post = get_post($args);
             if ($existing_post instanceof \WP_Post) {
-                return new Entities\Field($existing_post);
+                return new Entities\Metadatum($existing_post);
             } else {
                 return [];
             }
@@ -310,7 +310,7 @@ class Fields extends Repository {
 			
 			$args = $this->parse_fetch_args($args);
 			
-            $args['post_type'] = Entities\Field::get_post_type();
+            $args['post_type'] = Entities\Metadatum::get_post_type();
 
             $wp_query = new \WP_Query($args);
             return $this->fetch_output($wp_query, $output);
@@ -318,13 +318,13 @@ class Fields extends Repository {
     }
 
 	/**
-	 * fetch field by collection, considering inheritance
+	 * fetch metadatum by collection, considering inheritance
 	 * 
 	 * @param Entities\Collection $collection
-	 * @param array $args WP_Query args plus disabled_fields
+	 * @param array $args WP_Query args plus disabled_metadata
 	 * @param string $output The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
 	 *
-	 * @return array Entities\Field
+	 * @return array Entities\Metadatum
 	 * @throws \Exception
 	 */
     public function fetch_by_collection(Entities\Collection $collection, $args = [], $output = null){
@@ -336,7 +336,7 @@ class Fields extends Repository {
         //insert the actual collection
         $parents[] = $collection_id;
 
-        //search for default field
+        //search for default metadatum
         $parents[] = $this->get_default_metadata_attribute();
 
         $meta_query = array(
@@ -364,16 +364,16 @@ class Fields extends Repository {
 
     /**
      * Ordinate the result from fetch response if $collection has an ordination,
-     * fields not ordinated appear on the end of the list
+     * metadata not ordinated appear on the end of the list
      *
      *
      * @param $result Response from method fetch
      * @param Entities\Collection $collection
-     * @param bool $include_disabled Wether to include disabled fields in the results or not
+     * @param bool $include_disabled Wether to include disabled metadata in the results or not
      * @return array or WP_Query ordinate
      */
     public function order_result( $result, Entities\Collection $collection, $include_disabled = false ){
-        $order = $collection->get_fields_order();
+        $order = $collection->get_metadata_order();
         if($order) {
             $order = ( is_array($order) ) ? $order : unserialize($order);
 
@@ -387,7 +387,7 @@ class Fields extends Repository {
 
                     if( $index !== false ) {
 
-	                    // skipping fields disabled if the arg is set
+	                    // skipping metadata disabled if the arg is set
 	                    if ( ! $include_disabled && isset( $order[ $index ]['enabled'] ) && ! $order[ $index ]['enabled'] ) {
 		                    continue;
 	                    }
@@ -434,17 +434,17 @@ class Fields extends Repository {
     }
 	
 	/**
-     * @param \Tainacan\Entities\Field $field
-     * @return \Tainacan\Entities\Field
+     * @param \Tainacan\Entities\Metadatum $metadatum
+     * @return \Tainacan\Entities\Metadatum
      * {@inheritDoc}
      * @see \Tainacan\Repositories\Repository::insert()
      */
-    public function insert($field){
-    	$this->pre_update_category_field($field);
-        $new_field = parent::insert($field);
+    public function insert($metadatum){
+    	$this->pre_update_category_metadatum($metadatum);
+        $new_metadatum = parent::insert($metadatum);
 
-        $this->update_category_field($new_field);
-    	return $new_field;
+        $this->update_category_metadatum($new_metadatum);
+    	return $new_metadatum;
     }
 
 	/**
@@ -458,10 +458,10 @@ class Fields extends Repository {
 		return $this->insert($object);
     }
 
-    public function delete($field_id){
-		$this->delete_category_field($field_id);
+    public function delete($metadatum_id){
+		$this->delete_category_metadatum($metadatum_id);
 
-		$deleted =  new Entities\Field( wp_trash_post( $field_id ) );
+		$deleted =  new Entities\Metadatum( wp_trash_post( $metadatum_id ) );
 
 		if($deleted) {
 			do_action( 'tainacan-deleted', $deleted, [], false, true );
@@ -471,29 +471,29 @@ class Fields extends Repository {
     }
 
     /**
-     * fetch all registered field type classes
+     * fetch all registered metadatum type classes
      *
      * Possible outputs are:
-     * CLASS (default) - returns the Class name of of field types registered
-     * NAME - return an Array of the names of field types registered
+     * CLASS (default) - returns the Class name of of metadatum types registered
+     * NAME - return an Array of the names of metadatum types registered
      *
      * @param $output string CLASS | NAME
-     * @return array of Entities\Field_Types\Field_Type classes path name
+     * @return array of Entities\Metadatum_Types\Metadatum_Type classes path name
      */
-    public function fetch_field_types( $output = 'CLASS'){
+    public function fetch_metadatum_types( $output = 'CLASS'){
         $return = [];
 
-        do_action('register_field_types');
+        do_action('register_metadatum_types');
 
         if( $output === 'NAME' ){
-            foreach ($this->field_types as $field_type) {
-                $return[] = str_replace('Tainacan\Field_Types\\','', $field_type);
+            foreach ($this->metadatum_types as $metadatum_type) {
+                $return[] = str_replace('Tainacan\Metadatum_Types\\','', $metadatum_type);
             }
 
             return $return;
         }
 
-        return $this->field_types;
+        return $this->metadatum_types;
     }
 
 	/**
@@ -503,17 +503,17 @@ class Fields extends Repository {
 	 * @throws \ErrorException
 	 * @throws \Exception
 	 */
-    public function register_core_fields( Entities\Collection $collection ){
+    public function register_core_metadata( Entities\Collection $collection ){
 
-        $fields = $this->get_core_fields( $collection );
+        $metadata = $this->get_core_metadata( $collection );
 
         // TODO: create a better way to retrieve this data
-        $data_core_fields = [
+        $data_core_metadata = [
             'core_description' => [
                 'name'          => 'Description',
                 'description'   => 'description',
                 'collection_id' => $collection->get_id(),
-                'field_type'    => 'Tainacan\Field_Types\Core_Description',
+                'metadatum_type'    => 'Tainacan\Metadatum_Types\Core_Description',
                 'status'        => 'publish',
             	'exposer_mapping'	=> [
             		'dublin-core' => 'description'
@@ -523,7 +523,7 @@ class Fields extends Repository {
                 'name'          => 'Title',
                 'description'   => 'title',
                 'collection_id' => $collection->get_id(),
-                'field_type'    => 'Tainacan\Field_Types\Core_Title',
+                'metadatum_type'    => 'Tainacan\Metadatum_Types\Core_Title',
                 'status'        => 'publish',
             	'exposer_mapping'	=> [
             		'dublin-core' => 'title'
@@ -535,26 +535,26 @@ class Fields extends Repository {
             return false;
         }
 
-        foreach ( $data_core_fields as $index => $data_core_field ) {
-            if( empty( $fields ) ){
-                $this->insert_array_field( $data_core_field );
+        foreach ( $data_core_metadata as $index => $data_core_metadatum ) {
+            if( empty( $metadata ) ){
+                $this->insert_array_metadatum( $data_core_metadatum );
             } else {
                 $exists = false;
-                foreach ( $fields as $field ){
-                    if ( $field->get_field_type() === $data_core_field['field_type'] ) {
+                foreach ( $metadata as $metadatum ){
+                    if ( $metadatum->get_metadatum_type() === $data_core_metadatum['metadatum_type'] ) {
                         $exists = true;
                     }
                 }
 
                 if( !$exists ){
-                    $this->insert_array_field( $data_core_field );
+                    $this->insert_array_metadatum( $data_core_metadatum );
                 }
             }
         }
     }
 
 	/**
-	 * block user from remove core fields
+	 * block user from remove core metadata
 	 *
 	 * @param $before  wordpress pass a null value
 	 * @param $post the post which is moving to trash
@@ -562,16 +562,16 @@ class Fields extends Repository {
 	 * @return null/bool
 	 * @throws \Exception
 	 */
-    public function disable_delete_core_fields( $before, $post ){
-        $field = $this->fetch( $post->ID );
+    public function disable_delete_core_metadata( $before, $post ){
+        $metadatum = $this->fetch( $post->ID );
 
-        if ( $field && in_array( $field->get_field_type(), $this->core_fields ) &&  is_numeric($field->get_collection_id()) ) {
+        if ( $metadatum && in_array( $metadatum->get_metadatum_type(), $this->core_metadata ) &&  is_numeric($metadatum->get_collection_id()) ) {
             return false;
         }
     }
 
 	/**
-	 * block user from remove core fields ( if use wp_delete_post)
+	 * block user from remove core metadata ( if use wp_delete_post)
 	 *
 	 * @param $before  wordpress pass a null value
 	 * @param $post the post which is deleting
@@ -581,10 +581,10 @@ class Fields extends Repository {
 	 * @throws \Exception
 	 * @internal param The $post_id post ID which is deleting
 	 */
-    public function force_delete_core_fields( $before, $post, $force_delete ){
-        $field = $this->fetch( $post->ID );
+    public function force_delete_core_metadata( $before, $post, $force_delete ){
+        $metadatum = $this->fetch( $post->ID );
 
-        if ( $field && in_array( $field->get_field_type(), $this->core_fields ) &&  is_numeric($field->get_collection_id()) ) {
+        if ( $metadatum && in_array( $metadatum->get_metadatum_type(), $this->core_metadata ) &&  is_numeric($metadatum->get_collection_id()) ) {
             return false;
         }
     }
@@ -597,7 +597,7 @@ class Fields extends Repository {
 	 * @return Array|\WP_Query
 	 * @throws \Exception
 	 */
-    public function get_core_fields( Entities\Collection $collection ){
+    public function get_core_metadata( Entities\Collection $collection ){
         $args = [];
 
         $meta_query = array(
@@ -607,8 +607,8 @@ class Fields extends Repository {
                 'compare' => 'IN',
             ),
             array(
-                'key'     => 'field_type',
-                'value'   => $this->core_fields,
+                'key'     => 'metadatum_type',
+                'value'   => $this->core_metadata,
                 'compare' => 'IN',
             )
         );
@@ -619,74 +619,74 @@ class Fields extends Repository {
     }
 
 	/**
-	 * create a field entity and insert by an associative array ( attribute => value )
+	 * create a metadatum entity and insert by an associative array ( attribute => value )
 	 *
-	 * @param Array $data the array of attributes to insert a field
+	 * @param Array $data the array of attributes to insert a metadatum
 	 *
-	 * @return int the field id inserted
+	 * @return int the metadatum id inserted
 	 * @throws \ErrorException
 	 * @throws \Exception
 	 */
-    public function insert_array_field( $data ){
-        $field = new Entities\Field();
+    public function insert_array_metadatum( $data ){
+        $metadatum = new Entities\Metadatum();
         foreach ( $data as $attribute => $value ) {
             $set_ = 'set_' . $attribute;
-            $field->$set_( $value );
+            $metadatum->$set_( $value );
         }
 
-        if ( $field->validate( )) {
-            $field = $this->insert( $field );
-            return $field->get_id();
+        if ( $metadatum->validate( )) {
+            $metadatum = $this->insert( $metadatum );
+            return $metadatum->get_id();
         } else {
-            throw new \ErrorException('The entity wasn\'t validated.' . print_r( $field->get_errors(), true));
+            throw new \ErrorException('The entity wasn\'t validated.' . print_r( $metadatum->get_errors(), true));
         }
     }
 
 
-    # TODO: Fetch all field value for repository level
+    # TODO: Fetch all metadatum value for repository level
 
 	/**
-	 * Fetch all values of a field from a collection or repository
+	 * Fetch all values of a metadatum from a collection or repository
 	 *
 	 * @param $collection_id
-	 * @param $field_id
+	 * @param $metadatum_id
 	 *
 	 * @param string $search
 	 *
 	 * @return array|null|object
 	 * @throws \Exception
 	 */
-	public function fetch_all_field_values($collection_id, $field_id, $search = ''){
+	public function fetch_all_metadatum_values($collection_id, $metadatum_id, $search = ''){
 		global $wpdb;
 
 		// Clear the result cache
 		$wpdb->flush();
 
-		$field = new Entities\Field( $field_id );
+		$metadatum = new Entities\Metadatum( $metadatum_id );
 
 		// handle core titles
-		if( strpos( $field->get_field_type(), 'Core') !== false ){
+		if( strpos( $metadatum->get_metadatum_type(), 'Core') !== false ){
 		    $collection = new Entities\Collection( $collection_id );
 		    $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
             $items = $Tainacan_Items->fetch( ['s' => $search], $collection, 'OBJECT');
             $return = [];
 
             foreach ($items as $item) {
-                if( strpos( $field->get_field_type(), 'Core_Title')  !== false  ){
+                if( strpos( $metadatum->get_metadatum_type(), 'Core_Title')  !== false  ){
                 	$title = $item->get_title();
 
 	                if(!empty($search) && stristr($title, $search) !== false) {
-		                $return[] = [ 'item_id' => $item->get_id(), 'field_id' => $field_id, 'mvalue' => $title ];
+		                $return[] = [ 'item_id' => $item->get_id(), 'metadatum_id' => $metadatum_id, 'mvalue' => $title ];
 	                } elseif (empty($search)) {
-		                $return[] = [ 'item_id' => $item->get_id(), 'field_id' => $field_id, 'mvalue' => $title ];
+		                $return[] = [ 'item_id' => $item->get_id(), 'metadatum_id' => $metadatum_id, 'mvalue' => $title ];
 	                }
                 } else {
                 	$description = $item->get_description();
 
                 	if(!empty($search) && stristr($description, $search) !== false) {
-		                $return[] = [ 'item_id' => $item->get_id(), 'field_id' => $field_id, 'mvalue' => $description ];
+		                $return[] = [ 'item_id' => $item->get_id(), 'metadatum_id' => $metadatum_id, 'mvalue' => $description ];
 	                } elseif (empty($search)) {
-		                $return[] = [ 'item_id' => $item->get_id(), 'field_id' => $field_id, 'mvalue' => $description ];
+		                $return[] = [ 'item_id' => $item->get_id(), 'metadatum_id' => $metadatum_id, 'mvalue' => $description ];
 	                }
                 }
             }
@@ -727,33 +727,33 @@ class Fields extends Repository {
 
 				if($collection_id) {
 					$sql_string = $wpdb->prepare(
-						"SELECT item_id, field_id, mvalue 
+						"SELECT item_id, metadatum_id, mvalue 
 				  		FROM (
 			  				SELECT ID as item_id
 		  					FROM $wpdb->posts
 	  						WHERE post_type LIKE %s AND post_status = %s
   						) items
 						JOIN (
-						  	SELECT meta_key as field_id, meta_value as mvalue, post_id
+						  	SELECT meta_key as metadatum_id, meta_value as mvalue, post_id
 					  	  	FROM $wpdb->postmeta $search_query
 				  		) metas
-			  			ON items.item_id = metas.post_id AND metas.field_id = %d",
-						$item_post_type, $post_status, $field_id
+			  			ON items.item_id = metas.post_id AND metas.metadatum_id = %d",
+						$item_post_type, $post_status, $metadatum_id
 					);
 				} else {
 					$sql_string = $wpdb->prepare(
-						"SELECT item_id, field_id, mvalue 
+						"SELECT item_id, metadatum_id, mvalue 
 				  		FROM (
 			  				SELECT ID as item_id
 		  					FROM $wpdb->posts
 	  						WHERE post_status = %s
   						) items
 						JOIN (
-						  	SELECT meta_key as field_id, meta_value as mvalue, post_id
+						  	SELECT meta_key as metadatum_id, meta_value as mvalue, post_id
 					  	  	FROM $wpdb->postmeta $search_query
 				  		) metas
-			  			ON items.item_id = metas.post_id AND metas.field_id = %d",
-						$post_status, $field_id
+			  			ON items.item_id = metas.post_id AND metas.metadatum_id = %d",
+						$post_status, $metadatum_id
 					);
 				}
 
@@ -773,33 +773,33 @@ class Fields extends Repository {
 
 				if($collection_id) {
 					$sql_string = $wpdb->prepare(
-						"SELECT item_id, field_id, mvalue 
+						"SELECT item_id, metadatum_id, mvalue 
 		  	        	FROM (
 	  	  		        	SELECT ID as item_id
   	  			        	FROM $wpdb->posts
   				        	WHERE post_type LIKE %s AND post_status = %s
 					  	) items
 					  	JOIN (
-					    	SELECT meta_key as field_id, meta_value as mvalue, post_id
+					    	SELECT meta_key as metadatum_id, meta_value as mvalue, post_id
 							FROM $wpdb->postmeta $search_query
 					  	) metas
-					  	ON items.item_id = metas.post_id AND metas.field_id = %d",
-						$item_post_type, $post_status, $field_id
+					  	ON items.item_id = metas.post_id AND metas.metadatum_id = %d",
+						$item_post_type, $post_status, $metadatum_id
 					);
 				} else {
 					$sql_string = $wpdb->prepare(
-						"SELECT item_id, field_id, mvalue 
+						"SELECT item_id, metadatum_id, mvalue 
 		  	        	FROM (
 	  	  		        	SELECT ID as item_id
   	  			        	FROM $wpdb->posts
   				        	WHERE post_status = %s
 					  	) items
 					  	JOIN (
-					    	SELECT meta_key as field_id, meta_value as mvalue, post_id
+					    	SELECT meta_key as metadatum_id, meta_value as mvalue, post_id
 							FROM $wpdb->postmeta $search_query
 					  	) metas
-					  	ON items.item_id = metas.post_id AND metas.field_id = %d",
-						$post_status, $field_id
+					  	ON items.item_id = metas.post_id AND metas.metadatum_id = %d",
+						$post_status, $metadatum_id
 					);
 				}
 
@@ -815,41 +815,41 @@ class Fields extends Repository {
 	}
 	
 	/**
-	 * Stores the value of the taxonomy_id option to use on update_category_field method.
+	 * Stores the value of the taxonomy_id option to use on update_category_metadatum method.
 	 *
 	 */
-	private function pre_update_category_field($field) {
-		$field_type = $field->get_field_type_object();
+	private function pre_update_category_metadatum($metadatum) {
+		$metadatum_type = $metadatum->get_metadatum_type_object();
 		$current_tax = '';
-		if ($field_type->get_primitive_type() == 'term') {
+		if ($metadatum_type->get_primitive_type() == 'term') {
 			
-			$options = $this->get_mapped_property($field, 'field_type_options');
-			$field_type->set_options($options);
-			$current_tax = $field_type->get_option('taxonomy_id');
+			$options = $this->get_mapped_property($metadatum, 'metadatum_type_options');
+			$metadatum_type->set_options($options);
+			$current_tax = $metadatum_type->get_option('taxonomy_id');
 		}
 		$this->current_taxonomy = $current_tax;
 	}
 
 	/**
-	 * Triggers hooks when saving a Category Field, indicating wich taxonomy was added or removed from a collection.
+	 * Triggers hooks when saving a Category Metadatum, indicating wich taxonomy was added or removed from a collection.
 	 *
 	 * This is used by Taxonomies repository to update the collections_ids property of the taxonomy as
-	 * a field type category is inserted or removed
+	 * a metadatum type category is inserted or removed
 	 *
-	 * @param  [type] $field [description]
+	 * @param  [type] $metadatum [description]
 	 *
 	 * @return void [type]        [description]
 	 */
-	private function update_category_field($field) {
-		$field_type = $field->get_field_type_object();
+	private function update_category_metadatum($metadatum) {
+		$metadatum_type = $metadatum->get_metadatum_type_object();
 		$new_tax = '';
 		
-		if ($field_type->get_primitive_type() == 'term') {
-			$new_tax = $field_type->get_option('taxonomy_id');
+		if ($metadatum_type->get_primitive_type() == 'term') {
+			$new_tax = $metadatum_type->get_option('taxonomy_id');
 		}
 		
 		if ($new_tax != $this->current_taxonomy) {
-			$collection = $field->get_collection();
+			$collection = $metadatum->get_collection();
 
 			if (!empty($this->current_taxonomy) && $collection) {
 				do_action('tainacan-taxonomy-removed-from-collection', $this->current_taxonomy, $collection);
@@ -862,14 +862,14 @@ class Fields extends Repository {
 		}
 	}
 	
-	private function delete_category_field($field_id) {
-		$field = $this->fetch($field_id);
-		$field_type = $field->get_field_type_object();
+	private function delete_category_metadatum($metadatum_id) {
+		$metadatum = $this->fetch($metadatum_id);
+		$metadatum_type = $metadatum->get_metadatum_type_object();
 
-		if ($field_type->get_primitive_type() == 'term') {
-			$removed_tax = $field_type->get_option('taxonomy_id');
+		if ($metadatum_type->get_primitive_type() == 'term') {
+			$removed_tax = $metadatum_type->get_option('taxonomy_id');
 
-			$collection = $field->get_collection();
+			$collection = $metadatum->get_collection();
 
 			if (!empty($removed_tax) &&  $collection) {
 				do_action( 'tainacan-taxonomy-removed-from-collection', $removed_tax, $collection );
diff --git a/src/classes/repositories/class-tainacan-repository.php b/src/classes/repositories/class-tainacan-repository.php
index 5a8ee80f9..30f5f26b2 100644
--- a/src/classes/repositories/class-tainacan-repository.php
+++ b/src/classes/repositories/class-tainacan-repository.php
@@ -446,13 +446,13 @@ abstract class Repository {
 			$Tainacan_Collections = Repositories\Collections::get_instance();
 			$Tainacan_Filters     = Repositories\Filters::get_instance();
 			$Tainacan_Logs        = Repositories\Logs::get_instance();
-			$Tainacan_Fields      = Repositories\Fields::get_instance();
+			$Tainacan_Metadata      = Repositories\Metadata::get_instance();
 			$Tainacan_Taxonomies  = Repositories\Taxonomies::get_instance();
 			$Tainacan_Terms       = Repositories\Terms::get_instance();
 
 			$tnc_globals = [
 				$Tainacan_Collections,
-				$Tainacan_Fields,
+				$Tainacan_Metadata,
 				$Tainacan_Filters,
 				$Tainacan_Taxonomies,
 				$Tainacan_Terms,
@@ -489,7 +489,7 @@ abstract class Repository {
 			return $Tainacan_Items;
 		} else {
 			$Tainacan_Collections   = \Tainacan\Repositories\Collections::get_instance();
-			$Tainacan_Fields        = \Tainacan\Repositories\Fields::get_instance();
+			$Tainacan_Metadata        = \Tainacan\Repositories\Metadata::get_instance();
 			$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 			$Tainacan_Filters       = \Tainacan\Repositories\Filters::get_instance();
 			$Tainacan_Taxonomies    = \Tainacan\Repositories\Taxonomies::get_instance();
@@ -498,7 +498,7 @@ abstract class Repository {
 
 			$tnc_globals = [
 				$Tainacan_Collections,
-				$Tainacan_Fields,
+				$Tainacan_Metadata,
 				$Tainacan_Item_Metadata,
 				$Tainacan_Filters,
 				$Tainacan_Taxonomies,
diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php
index 98ef632e0..1e0fe815a 100644
--- a/src/classes/tainacan-creator.php
+++ b/src/classes/tainacan-creator.php
@@ -1,7 +1,7 @@
 <?php
 
 const TAINACAN_ENTITIES_DIR 	   = __DIR__ . '/entities/';
-const TAINACAN_FIELD_TYPES_DIR  = __DIR__ . '/field-types/';
+const TAINACAN_METADATUM_TYPES_DIR  = __DIR__ . '/metadatum-types/';
 const TAINACAN_FILTER_TYPES_DIR = __DIR__ . '/filter-types/';
 const TAINACAN_REPOSITORIES_DIR = __DIR__ . '/repositories/';
 const TAINACAN_TRAITS_DIR 	   = __DIR__ . '/traits/';
@@ -14,7 +14,7 @@ const TAINACAN_EXPOSERS_DIR		= __DIR__ . '/../exposers/';
 const DIRS = [
     TAINACAN_CLASSES_DIR,
     TAINACAN_ENTITIES_DIR,
-    TAINACAN_FIELD_TYPES_DIR,
+    TAINACAN_METADATUM_TYPES_DIR,
     TAINACAN_FILTER_TYPES_DIR,
     TAINACAN_REPOSITORIES_DIR,
     TAINACAN_TRAITS_DIR,
@@ -71,7 +71,7 @@ function tainacan_autoload($class_name){
 		    $dir = TAINACAN_CLASSES_DIR;
 	    }
 
-        if( in_array('Field_Types', $class_path) || in_array('Filter_Types', $class_path) ){
+        if( in_array('Metadatum_Types', $class_path) || in_array('Filter_Types', $class_path) ){
     	    $exceptions = ['categorytaginput','categorycheckbox','categoryselectbox'];
     	    if( in_array( strtolower( $class_name ), $exceptions) ){
                 $dir.= 'category/';
@@ -92,17 +92,17 @@ $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
 
 $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
-$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
-//register field types
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Text');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Textarea');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Date');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Numeric');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Selectbox');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Relationship');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Category');
-$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Compound');
+//register metadatum types
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Text');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Textarea');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Date');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Numeric');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Selectbox');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Relationship');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Category');
+$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Compound');
 
 $Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 
diff --git a/src/classes/traits/class-tainacan-entity-collection-relation.php b/src/classes/traits/class-tainacan-entity-collection-relation.php
index 3f64a91dd..32769fb4f 100644
--- a/src/classes/traits/class-tainacan-entity-collection-relation.php
+++ b/src/classes/traits/class-tainacan-entity-collection-relation.php
@@ -5,7 +5,7 @@ use Tainacan\Entities;
 use Tainacan\Entities\Collection;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
-// used by Item, Event, Field
+// used by Item, Event, Metadatum
 
 /**
  * Defines Collection and Items relation
diff --git a/src/dev-interface/class-tainacan-dev-interface.php b/src/dev-interface/class-tainacan-dev-interface.php
index 19852b581..fa3d5a3d5 100644
--- a/src/dev-interface/class-tainacan-dev-interface.php
+++ b/src/dev-interface/class-tainacan-dev-interface.php
@@ -28,10 +28,10 @@ class DevInterface {
         $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
         $Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
         $Tainacan_Logs = \Tainacan\Repositories\Logs::get_instance();
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
         
-        $repositories = [$Tainacan_Collections, $Tainacan_Filters, $Tainacan_Logs, $Tainacan_Fields, $Tainacan_Taxonomies];
+        $repositories = [$Tainacan_Collections, $Tainacan_Filters, $Tainacan_Logs, $Tainacan_Metadata, $Tainacan_Taxonomies];
         
         foreach ($repositories as $repo) {
 	        $tnc_entity = new $repo->entities_type();
@@ -71,7 +71,7 @@ class DevInterface {
     /**
      * Run through all post types attributes and add metaboxes for them.
      *
-     * Also run through all collections field and add metaboxes for its items post type
+     * Also run through all collections metadatum and add metaboxes for its items post type
      * 
      * @return void
      */
@@ -96,7 +96,7 @@ class DevInterface {
         
         foreach ($collections as $col) {
             add_meta_box(
-                $col->get_db_identifier() . '_field',
+                $col->get_db_identifier() . '_metadatum',
                 __('Metadata', 'tainacan'),
                 array(&$this, 'metadata_metabox'),
                 $col->get_db_identifier(), //post type
@@ -121,9 +121,9 @@ class DevInterface {
         $Tainacan_Logs = \Tainacan\Repositories\Logs::get_instance();
         $this->properties_metabox($Tainacan_Logs);
     }
-    function properties_metabox_Fields() {
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-        $this->properties_metabox($Tainacan_Fields);
+    function properties_metabox_Metadata() {
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+        $this->properties_metabox($Tainacan_Metadata);
     }
     function properties_metabox_Taxonomies() {
         $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
@@ -137,7 +137,7 @@ class DevInterface {
         
         $entity = new $repo->entities_type($post);
         
-        wp_nonce_field( 'save_'.$repo->get_name(), $repo->get_name().'_noncename' );
+        wp_nonce_METADATUM( 'save_'.$repo->get_name(), $repo->get_name().'_noncename' );
         
         ?>
         <div id="postcustomstuff">
@@ -169,16 +169,16 @@ class DevInterface {
                                     <?php  Helpers\HtmlHelpers::collections_dropdown( $value ); ?>
                                 <?php elseif ($prop == 'collections_ids'): ?>
                                     <?php  Helpers\HtmlHelpers::collections_checkbox_list( $value ); ?>
-                                <?php elseif ( $prop == 'field' && $entity->get_collection_id() ): ?>
+                                <?php elseif ( $prop == 'metadatum' && $entity->get_collection_id() ): ?>
                                     <?php Helpers\HtmlHelpers::metadata_dropdown(
                                         $entity->get_collection_id(),
                                         ( isset( $value ) ) ? $value : '',
-                                        'tnc_prop_field'
+                                        'tnc_prop_metadatum'
                                     ) ?>
-                                <?php elseif ($prop == 'field_type_options' || $prop == 'filter_type_options'): ?>
+                                <?php elseif ($prop == 'metadatum_type_options' || $prop == 'filter_type_options'): ?>
                                     <?php echo $value; ?>
-                                <?php elseif ($prop == 'field_type'): ?>
-                                    <?php echo $this->field_type_dropdown($post->ID,$value); ?>
+                                <?php elseif ($prop == 'metadatum_type'): ?>
+                                    <?php echo $this->metadatum_type_dropdown($post->ID,$value); ?>
                                 <?php elseif ($prop == 'filter_type'): ?>
                                     <?php echo $this->filter_type_dropdown($post->ID,$value); ?>
                                 <?php else: ?>
@@ -227,7 +227,7 @@ class DevInterface {
         if (!$entity->get_collection_id())
             $entity->set_collection($current_collection);
         
-        $field = $Tainacan_Item_Metadata->fetch($entity, 'OBJECT');
+        $metadatum = $Tainacan_Item_Metadata->fetch($entity, 'OBJECT');
         
         wp_nonce_field( 'save_metadata_'.$typenow, $typenow.'_metadata_noncename' );
         
@@ -247,7 +247,7 @@ class DevInterface {
                 
                 <tbody>
                     
-                    <?php foreach ($field as $item_meta): ?>
+                    <?php foreach ($metadatum as $item_meta): ?>
                         
                         <?php 
                             $value = $item_meta->get_value();
@@ -255,11 +255,11 @@ class DevInterface {
                         ?>
                         <tr>
                             <td>
-                                <label><?php echo $item_meta->get_field()->get_name(); ?></label><br/>
-                                <small><?php echo $item_meta->get_field()->get_description(); ?></small>
+                                <label><?php echo $item_meta->get_metadatum()->get_name(); ?></label><br/>
+                                <small><?php echo $item_meta->get_metadatum()->get_description(); ?></small>
                             </td>
                             <td>
-                                <textarea name="tnc_metadata_<?php echo $item_meta->get_field()->get_id(); ?>"><?php echo htmlspecialchars($value); ?></textarea>
+                                <textarea name="tnc_metadata_<?php echo $item_meta->get_metadatum()->get_id(); ?>"><?php echo htmlspecialchars($value); ?></textarea>
                             </td>
                         </tr>
                         
@@ -299,7 +299,7 @@ class DevInterface {
         if (!$entity->get_collection_id())
             $entity->set_collection($current_collection);
         
-        $field = $Tainacan_Item_Metadata->fetch($entity, 'OBJECT');
+        $metadatum = $Tainacan_Item_Metadata->fetch($entity, 'OBJECT');
         
         wp_nonce_field( 'save_metadata_'.$typenow, $typenow.'_metadata_noncename' );
         
@@ -319,7 +319,7 @@ class DevInterface {
                 
                 <tbody>
                     
-                    <?php foreach ($field as $item_meta): ?>
+                    <?php foreach ($metadatum as $item_meta): ?>
                         
                         <?php 
                             $value = $item_meta->get_value();
@@ -327,12 +327,12 @@ class DevInterface {
                         ?>
                         <tr>
                             <td>
-                                <label><?php echo $item_meta->get_field()->get_name(); ?></label><br/>
-                                <small><?php echo $item_meta->get_field()->get_description(); ?></small>
+                                <label><?php echo $item_meta->get_metadatum()->get_name(); ?></label><br/>
+                                <small><?php echo $item_meta->get_metadatum()->get_description(); ?></small>
                             </td>
                             <td>
-                                <?php //echo '<tainacan-text name="'.$item_meta->get_field()->get_name().'"></tainacan-text>'; ?>
-                                <?php echo  $item_meta->get_field()->get_field_type_object()->render( $item_meta ); ?>
+                                <?php //echo '<tainacan-text name="'.$item_meta->get_metadatum()->get_name().'"></tainacan-text>'; ?>
+                                <?php echo  $item_meta->get_metadatum()->get_metadatum_type_object()->render( $item_meta ); ?>
                             </td>
                         </tr>
                         
@@ -347,26 +347,26 @@ class DevInterface {
         
     }
 
-    function field_type_dropdown($id,$selected) {
+    function metadatum_type_dropdown($id,$selected) {
 
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $class = ( class_exists( $selected ) ) ? new $selected() : '';
 
         if(is_object( $class )){
-            $selected =  str_replace('Tainacan\Field_Types\\','', get_class( $class ) );
+            $selected =  str_replace('Tainacan\Metadatum_Types\\','', get_class( $class ) );
         }
 
-        $field_types = $Tainacan_Fields->fetch_field_types('NAME');
+        $metadatum_types = $Tainacan_Metadata->fetch_metadatum_types('NAME');
         ?>
-            <select name="tnc_prop_field_type">
-                <?php foreach ($field_types as $field_type): ?>
-                    <option value="<?php echo $field_type; ?>" <?php selected($field_type, $selected) ?>><?php echo $field_type; ?></option>
+            <select name="tnc_prop_metadatum_type">
+                <?php foreach ($metadatum_types as $metadatum_type): ?>
+                    <option value="<?php echo $metadatum_type; ?>" <?php selected($metadatum_type, $selected) ?>><?php echo $metadatum_type; ?></option>
                 <?php endforeach; ?>
             </select>
             <?php
              if( $class ){
-                 $options = get_post_meta($id,'field_type_options',true);
+                 $options = get_post_meta($id,'metadatum_type_options',true);
                  $class->set_options($options);
                  echo $class->form();
              }
@@ -454,12 +454,12 @@ class DevInterface {
                 if ($entity->validate_prop($prop)) {
 
                     // we cannot user repository->insert here, it would create an infinite loop
-                    if ($prop == 'field_type') {
+                    if ($prop == 'metadatum_type') {
                         //TODO: This can be better
-                        $class = '\Tainacan\Field_Types\\'.$value;
-                        update_post_meta($post_id, 'field_type_options', $_POST['field_type_'.strtolower( $value ) ] );
-                        update_post_meta($post_id, 'field_type',  wp_slash( get_class( new $class() ) ) );
-                    } elseif($prop == 'field_type_options' || $prop == 'filter_type_options') {
+                        $class = '\Tainacan\Metadatum_Types\\'.$value;
+                        update_post_meta($post_id, 'metadatum_type_options', $_POST['metadatum_type_'.strtolower( $value ) ] );
+                        update_post_meta($post_id, 'metadatum_type',  wp_slash( get_class( new $class() ) ) );
+                    } elseif($prop == 'metadatum_type_options' || $prop == 'filter_type_options') {
                         continue;
                     } elseif ($prop == 'filter_type') {
                         $class = str_replace('\\\\','\\','\Tainacan\Filter_Types\\'.$value );
@@ -483,7 +483,7 @@ class DevInterface {
             // or I could try to initialize an entity and find out what type it is
 
             $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
-            $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+            $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
             $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
             $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
@@ -505,12 +505,12 @@ class DevInterface {
                 }
                 
                 
-                $metalist = $Tainacan_Fields->fetch_by_collection($cpts[$post_type], [], 'OBJECT');
+                $metalist = $Tainacan_Metadata->fetch_by_collection($cpts[$post_type], [], 'OBJECT');
                 
                 foreach ($metalist as $meta) {
                     $item_meta = new \Tainacan\Entities\Item_Metadata_Entity($entity, $meta);
 
-                    $pos = strpos($item_meta->get_field()->get_field_type(), 'Core');
+                    $pos = strpos($item_meta->get_metadatum()->get_metadatum_type(), 'Core');
                     if( $pos !== false ){
                         continue;
                     }
diff --git a/src/dev-interface/class-tainacan-helpers-html.php b/src/dev-interface/class-tainacan-helpers-html.php
index eec5d67a8..d4f0e1bae 100644
--- a/src/dev-interface/class-tainacan-helpers-html.php
+++ b/src/dev-interface/class-tainacan-helpers-html.php
@@ -6,16 +6,16 @@ use Tainacan\Entities;
  class  HtmlHelpers {
 
      /**
-      * generates select field for all publish collections
+      * generates select metadatum for all publish collections
       *
       * @param string $selected The collection id for the selected option
-      * @param string $name_field (optional) default 'tnc_prop_collections_id'
+      * @param string $name_metadatum (optional) default 'tnc_prop_collections_id'
       */
-    public static function collections_dropdown($selected, $name_field = 'tnc_prop_collection_id'){
+    public static function collections_dropdown($selected, $name_metadatum = 'tnc_prop_collection_id'){
         $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
         $collections = $Tainacan_Collections->fetch([], 'OBJECT');
         ?>
-        <select name="<?php echo $name_field ?>">
+        <select name="<?php echo $name_metadatum ?>">
             <?php foreach ($collections as $col): ?>
                 <option value="<?php echo $col->get_id(); ?>" <?php selected($col->get_id(), $selected) ?>><?php echo $col->get_name(); ?></option>
             <?php endforeach; ?>
@@ -24,18 +24,18 @@ use Tainacan\Entities;
     }
 
      /**
-      * generates checboxes field for all publish collections
+      * generates checboxes metadatum for all publish collections
       *
       * @param string(json) $selected json with an array with ids to be checked
-      * @param string $name_field (optional) default 'tnc_prop_collections_ids[]'
+      * @param string $name_metadatum (optional) default 'tnc_prop_collections_ids[]'
       */
-    public static function collections_checkbox_list($selected,$name_field = 'tnc_prop_collections_ids[]') {
+    public static function collections_checkbox_list($selected,$name_metadatum = 'tnc_prop_collections_ids[]') {
         $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
         $collections = $Tainacan_Collections->fetch([], 'OBJECT');
         $selected = json_decode($selected);
         ?>
             <?php foreach ($collections as $col): ?>
-                 <input type="checkbox" name="<?php echo $name_field ?>" value="<?php echo $col->get_id(); ?>" <?php checked(in_array($col->get_id(), $selected)); ?> style="width: 15px;">
+                 <input type="checkbox" name="<?php echo $name_metadatum ?>" value="<?php echo $col->get_id(); ?>" <?php checked(in_array($col->get_id(), $selected)); ?> style="width: 15px;">
                  <?php echo $col->get_name(); ?>
                  <br/>
             <?php endforeach; ?>
@@ -43,21 +43,21 @@ use Tainacan\Entities;
     }
 
      /**
-      * generates select field for all publish field for a single collection
+      * generates select metadatum for all publish metadatum for a single collection
       *
       * @param Entities\Collection | integer $collection The collection id or the collection object
       * @param string $selected The collection id for the selected option
-      * @param string $name_field (optional) default 'tnc_prop_collections_id'
-      * @param array $args (optional) filter the field list
+      * @param string $name_metadatum (optional) default 'tnc_prop_collections_id'
+      * @param array $args (optional) filter the metadatum list
       */
-     public static function metadata_dropdown( $collection  , $selected, $name_field = 'tnc_prop_field_id', $args = []){
-         $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+     public static function metadata_dropdown( $collection  , $selected, $name_metadatum = 'tnc_prop_metadatum_id', $args = []){
+         $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
          $collection = ( is_numeric( $collection ) ) ? new Entities\Collection( $collection ) : $collection;
-         $field = $Tainacan_Fields->fetch_by_collection( $collection, $args, 'OBJECT');
+         $metadatum = $Tainacan_Metadata->fetch_by_collection( $collection, $args, 'OBJECT');
          ?>
-         <select name="<?php echo $name_field ?>">
+         <select name="<?php echo $name_metadatum ?>">
              <option value=""><?php echo __('Select an option','tainacan') ?>...</option>
-             <?php foreach ($field as $col): ?>
+             <?php foreach ($metadatum as $col): ?>
                  <option value="<?php echo $col->get_id(); ?>" <?php selected($col->get_id(), $selected) ?>><?php echo $col->get_name(); ?></option>
              <?php endforeach; ?>
          </select>
@@ -66,22 +66,22 @@ use Tainacan\Entities;
 
 
      /**
-      * generates checkboxes fields for all publish field for a single collection
+      * generates checkboxes metadata for all publish metadatum for a single collection
       *
       * @param Entities\Collection | integer $collection The collection id or the collection object
       * @param string(json) $selected string(json) | array  json with an array or array of ids to be checked
-      * @param string $name_field (optional) default 'tnc_prop_tnc_field_ids[]' the checkbox field name
-      * @param array $args (optional) filter the field list
+      * @param string $name_metadatum (optional) default 'tnc_prop_tnc_metadatum_ids[]' the checkbox metadatum name
+      * @param array $args (optional) filter the metadatum list
       */
-     public static function metadata_checkbox_list( $collection , $selected,$name_field = 'tnc_prop_tnc_field_ids[]', $args = []) {
-         $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+     public static function metadata_checkbox_list( $collection , $selected,$name_metadatum = 'tnc_prop_tnc_metadatum_ids[]', $args = []) {
+         $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
          $collection = ( is_numeric( $collection ) ) ? new Entities\Collection( $collection ) : $collection;
-         $field = $Tainacan_Fields->fetch_by_collection( $collection, $args, 'OBJECT');
+         $metadatum = $Tainacan_Metadata->fetch_by_collection( $collection, $args, 'OBJECT');
          $selected =  ( is_array( $selected) ) ? $selected : json_decode($selected);
          $selected =  ( $selected ) ?  $selected : [];
          ?>
-         <?php foreach ($field as $col): ?>
-             <input type="checkbox" name="<?php echo $name_field ?>" value="<?php echo $col->get_id(); ?>" <?php checked(in_array($col->get_id(), $selected)); ?> style="width: 15px;">
+         <?php foreach ($metadatum as $col): ?>
+             <input type="checkbox" name="<?php echo $name_metadatum ?>" value="<?php echo $col->get_id(); ?>" <?php checked(in_array($col->get_id(), $selected)); ?> style="width: 15px;">
              <?php echo $col->get_name(); ?>
              <br/>
          <?php endforeach; ?>
@@ -92,12 +92,12 @@ use Tainacan\Entities;
       * generates the radio button with options
       *
       * @param string $selected The value to be selectred
-      * @param string $name_field (optional) the radio field name
+      * @param string $name_metadatum (optional) the radio metadatum name
       * @param array $options (optional) Associative array, indexes are the radio values and the values are the labels. Default yes and no
       */
-     public static function radio_field( $selected, $name_field = 'radio_field', $options = [ 'yes' => 'Yes',  'no' => 'No' ]){
+     public static function radio_metadatum( $selected, $name_metadatum = 'radio_metadatum', $options = [ 'yes' => 'Yes',  'no' => 'No' ]){
          foreach ($options as $value => $option): ?>
-            <input type="radio" name="<?php echo $name_field ?>" value="<?php echo $value; ?>" <?php checked($value == $selected); ?> style="width: 15px;">
+            <input type="radio" name="<?php echo $name_metadatum ?>" value="<?php echo $value; ?>" <?php checked($value == $selected); ?> style="width: 15px;">
             <?php echo $option; ?>
             <br/>
         <?php endforeach;
diff --git a/src/exposers/class-tainacan-exposers.php b/src/exposers/class-tainacan-exposers.php
index 7c816182a..fa2426013 100644
--- a/src/exposers/class-tainacan-exposers.php
+++ b/src/exposers/class-tainacan-exposers.php
@@ -112,7 +112,7 @@ class Exposers {
 				if(substr($request->get_route(), 0, strlen('/tainacan/v2/items')) == '/tainacan/v2/items') { //TODO do it at rest not here
 					$repos_items = \Tainacan\Repositories\Items::get_instance();
 					$item = $repos_items->fetch($item_arr['id']);
-					$items_metadata = $item->get_fields();
+					$items_metadata = $item->get_metadata();
 					$prepared_item = [];
 					foreach ($items_metadata as $item_metadata){
 						array_push($prepared_item, $item_metadata->_toArray());
@@ -126,21 +126,21 @@ class Exposers {
 	}
 	
 	/**
-	 * Return array of mapped field 
+	 * Return array of mapped metadatum 
 	 * @param array $item_arr
 	 * @param Mappers\Mapper $mapper
 	 * @return array
 	 */
-	protected function map_field($item_arr, $mapper) {
+	protected function map_metadatum($item_arr, $mapper) {
 		$ret = $item_arr;
-		$field_mapping = $item_arr['field']['exposer_mapping'];
-		if(array_key_exists($mapper->slug, $field_mapping)) {
-			if(is_array($mapper->metadata) && !array_key_exists( $field_mapping[$mapper->slug], $mapper->metadata) ) {
+		$metadatum_mapping = $item_arr['metadatum']['exposer_mapping'];
+		if(array_key_exists($mapper->slug, $metadatum_mapping)) {
+			if(is_array($mapper->metadata) && !array_key_exists( $metadatum_mapping[$mapper->slug], $mapper->metadata) ) {
 				throw new \Exception('Invalid Mapper Option');
 			}
-			$ret = [$mapper->prefix.$field_mapping[$mapper->slug].$mapper->sufix => $item_arr['value']]; //TODO Validate option
+			$ret = [$mapper->prefix.$metadatum_mapping[$mapper->slug].$mapper->sufix => $item_arr['value']]; //TODO Validate option
 		} else if($mapper->slug == 'value') {
-			$ret = [$item_arr['field']['name'] => $item_arr['value']];
+			$ret = [$item_arr['metadatum']['name'] => $item_arr['value']];
 		}
 		return $ret;
 	}
@@ -154,12 +154,12 @@ class Exposers {
 	 */
 	protected function map($item_arr, $mapper, $resquest) {
 		$ret = $item_arr;
-		if(array_key_exists('field', $item_arr)){ // getting a unique field
-			$ret = $this->map_field($item_arr, $mapper);
+		if(array_key_exists('metadatum', $item_arr)){ // getting a unique metadatum
+			$ret = $this->map_metadatum($item_arr, $mapper);
 		} else { // array of elements
 			$ret = [];
 			foreach ($item_arr as $item) {
-				if(array_key_exists('field', $item)) {
+				if(array_key_exists('metadatum', $item)) {
 					$ret = array_merge($ret, $this->map($item, $mapper, $resquest) );
 				} else {
 					$ret[] = $this->map($item, $mapper, $resquest);
@@ -193,7 +193,7 @@ class Exposers {
     			}
     		} elseif($request->get_method() == 'POST') {
     		    if($mapper = $this->request_has_mapper($request)) {
-    		        return $this->create_mapped_fields( $response, $handler, $request, $mapper );
+    		        return $this->create_mapped_metadata( $response, $handler, $request, $mapper );
     		    }
     		}
 	    }
@@ -305,35 +305,35 @@ class Exposers {
 	 * @param \WP_REST_Request $request
 	 * @param Mapper $mapper
 	 */
-	public function create_mapped_fields( $response, $handler, $request, $mapper ) {
+	public function create_mapped_metadata( $response, $handler, $request, $mapper ) {
 	    if($response instanceof \WP_REST_Response && $response->get_status() == 201) {
 	       $collection_array = $response->get_data();
 	       $id = $collection_array['id'];
-	       $mapper_fields = $mapper->metadata;
-	       if(is_array($mapper_fields) ) {
-	           $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-	           foreach ($mapper_fields as $slug => $mapper_field) {
-	               if(array_key_exists('core_field', $mapper_field) && $mapper_field['core_field'] != false) continue;
+	       $mapper_metadata = $mapper->metadata;
+	       if(is_array($mapper_metadata) ) {
+	           $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+	           foreach ($mapper_metadata as $slug => $mapper_metadatum) {
+	               if(array_key_exists('core_metadatum', $mapper_metadatum) && $mapper_metadatum['core_metadatum'] != false) continue;
 	               
-	               $field = new \Tainacan\Entities\Field();
+	               $metadatum = new \Tainacan\Entities\Metadatum();
 	               if(
-	                       array_key_exists('field_type', $mapper_field) &&
-	                       $mapper_field['field_type'] != false &&
-	                       class_exists($mapper_field['field_type'])
+	                       array_key_exists('metadatum_type', $mapper_metadatum) &&
+	                       $mapper_metadatum['metadatum_type'] != false &&
+	                       class_exists($mapper_metadatum['metadatum_type'])
 	                   ) {
-	                   $field->set_field_type($mapper_field['field_type']);
+	                   $metadatum->set_metadatum_type($mapper_metadatum['metadatum_type']);
 	               } else {
-	                   $field->set_field_type('Tainacan\Field_Types\Text');
+	                   $metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text');
 	               }
-	               $field->set_name($mapper_field['label']);
-	               $field->set_description($mapper_field['URI']);
-	               $field->set_exposer_mapping([
+	               $metadatum->set_name($mapper_metadatum['label']);
+	               $metadatum->set_description($mapper_metadatum['URI']);
+	               $metadatum->set_exposer_mapping([
 	                   $mapper->slug => $slug
 	               ]);
-	               $field->set_status('publish');
-	               $field->set_collection_id($id);
-	               $field->set_slug($slug);
-	               if($field->validate()) $Tainacan_Fields->insert($field);
+	               $metadatum->set_status('publish');
+	               $metadatum->set_collection_id($id);
+	               $metadatum->set_slug($slug);
+	               if($metadatum->validate()) $Tainacan_Metadata->insert($metadatum);
 	           }
 	       }
 	    }
diff --git a/src/exposers/mappers/class-tainacan-dublin-core.php b/src/exposers/mappers/class-tainacan-dublin-core.php
index 8853e4a0f..908b9d279 100644
--- a/src/exposers/mappers/class-tainacan-dublin-core.php
+++ b/src/exposers/mappers/class-tainacan-dublin-core.php
@@ -10,7 +10,7 @@ namespace Tainacan\Exposers\Mappers;
 class Dublin_Core extends Mapper {
 	public $slug = 'dublin-core';
 	public $name = 'Dublin Core';
-	public $allow_extra_fields = true;
+	public $allow_extra_metadata = true;
 	public $context_url = 'http://dublincore.org/documents/dcmi-terms/';
 	public $header = '<?xml version="1.0"?><!DOCTYPE rdf:RDF SYSTEM "http://dublincore.org/2000/12/01-dcmes-xml-dtd.dtd"><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" ></rdf:RDF>';
 	public $prefix = 'dc:';
@@ -30,12 +30,12 @@ class Dublin_Core extends Mapper {
 		'date' => [
 			'URI' => 'http://purl.org/dc/elements/1.1/date',
 			'label' => 'Date',
-            'field_type' => 'date'
+            'metadatum_type' => 'date'
 		],
 		'description' => [
 			'URI' => 'http://purl.org/dc/elements/1.1/description',
 			'label' => 'Description',
-		    'core_field' => 'description'
+		    'core_metadatum' => 'description'
 		],
 		'format' => [
 			'URI' => 'http://purl.org/dc/elements/1.1/format',
@@ -72,7 +72,7 @@ class Dublin_Core extends Mapper {
 		'title' => [
 			'URI' => 'http://purl.org/dc/elements/1.1/title',
 			'label' => 'Title',
-		    'core_field' => 'title'
+		    'core_metadatum' => 'title'
 		],
 		'type' => [
 			'URI' => 'http://purl.org/dc/elements/1.1/type',
diff --git a/src/exposers/mappers/class-tainacan-mapper.php b/src/exposers/mappers/class-tainacan-mapper.php
index 38440ec25..605f6443f 100644
--- a/src/exposers/mappers/class-tainacan-mapper.php
+++ b/src/exposers/mappers/class-tainacan-mapper.php
@@ -5,25 +5,25 @@ namespace Tainacan\Exposers\Mappers;
 abstract class Mapper {
 	public $slug = null; // Slug of Mapper, used as option on api call 
 	public $name = null; // Public name do mapper
-	public $allow_extra_fields = true; // Allow more field to be register
+	public $allow_extra_metadata = true; // Allow more metadatum to be register
 	public $context_url = null; // URL of mapper documentation
 	
 	/**
 	 * array of supported metadata, false for not validade the list format:
 	 * ['slug'] => [
-	 *     'URI' => 'http://...',          // URI of the field description
+	 *     'URI' => 'http://...',          // URI of the metadatum description
 	 *     'label' => 'Label',             // Label to show on UI
-	 *     'field_type' => 'date',         // Tainacan recomended field type, default text
-	 *     'core_field' => 'description'   // if have a core tainacan field, what?
+	 *     'metadatum_type' => 'date',         // Tainacan recomended metadatum type, default text
+	 *     'core_metadatum' => 'description'   // if have a core tainacan metadatum, what?
 	 * ['date' => [
 	 *     	'URI' => 'http://purl.org/dc/elements/1.1/date',
 	 *  	'label' => 'Date',
-     *      'field_type' => 'date'
+     *      'metadatum_type' => 'date'
 	 *  ],
 	 *  'description' => [
 	 *  	'URI' => 'http://purl.org/dc/elements/1.1/description',
 	 *  	'label' => 'Description',
-	 *      'core_field' => 'description'
+	 *      'core_metadatum' => 'description'
 	 *  ]]
 	 * @var array
 	 */
@@ -37,7 +37,7 @@ abstract class Mapper {
 		return [
 			'slug' => $this->slug,
 			'name' => $this->name,
-			'allow_extra_fields' => $this->allow_extra_fields,
+			'allow_extra_metadata' => $this->allow_extra_metadata,
 			'context_url' => $this->context_url,
 			'metadata' => $this->metadata,
 			'prefix' => $this->prefix,
diff --git a/src/exposers/mappers/class-tainacan-value.php b/src/exposers/mappers/class-tainacan-value.php
index 9dc366eed..8389ae9bd 100644
--- a/src/exposers/mappers/class-tainacan-value.php
+++ b/src/exposers/mappers/class-tainacan-value.php
@@ -3,13 +3,13 @@
 namespace Tainacan\Exposers\Mappers;
 
 /**
- *  Mapper class for export fields in key => value format where key can be defined 
+ *  Mapper class for export metadata in key => value format where key can be defined
  *
  */
 class Value extends Mapper {
 	public $slug = 'value';
 	public $name = 'Value';
-	public $allow_extra_fields = true;
+	public $allow_extra_metadata = true;
 	public $context_url = '';
 	public $header = '';
 	public $metadata = false;
diff --git a/src/importer/class-tainacan-csv.php b/src/importer/class-tainacan-csv.php
index 86e92c209..a2894fb3a 100644
--- a/src/importer/class-tainacan-csv.php
+++ b/src/importer/class-tainacan-csv.php
@@ -21,7 +21,7 @@ class CSV extends Importer {
     /**
      * @inheritdoc
      */
-    public function get_source_fields(){
+    public function get_source_metadata(){
         $file =  new \SplFileObject( $this->tmp_file, 'r' );
         $file->seek(0 );
         return $file->fgetcsv( $this->get_option('delimiter') );
@@ -33,7 +33,7 @@ class CSV extends Importer {
      */
     public function process_item( $index, $collection_definition ){
         $processedItem = [];
-        $headers = $this->get_source_fields();
+        $headers = $this->get_source_metadata();
         
         // search the index in the file and get values
         $file =  new \SplFileObject( $this->tmp_file, 'r' );
diff --git a/src/importer/class-tainacan-importer.php b/src/importer/class-tainacan-importer.php
index 9772d37b4..742682da3 100644
--- a/src/importer/class-tainacan-importer.php
+++ b/src/importer/class-tainacan-importer.php
@@ -26,7 +26,7 @@ abstract class Importer {
 	 * the metadata from the source to the target collection.
 	 *
 	 * If set to true in the child class, it must implement the method 
-	 * get_source_fields() to return the field found in the source.
+	 * get_source_metadata() to return the metadatum found in the source.
 	 *
 	 * Note that this will only work when importing items to one single collection.
 	 * @var bool
@@ -62,7 +62,7 @@ abstract class Importer {
 	 * This array holds the structure that the default step 'process_collections' will handle.
 	 *
 	 * Its an array of the target collections, with their IDs, an identifier from the source, the total number of items to be imported, the mapping array 
-	 * from the source structure to the ID of the metadata fields in tainacan
+	 * from the source structure to the ID of the metadata metadata in tainacan
 	 *
 	 * The format of the map is an array where the keys are the metadata IDs of the destination collection and the 
 	 * values are the identifier from the source. This could be an ID or a string or whatever the importer finds appropriate to handle
@@ -512,23 +512,23 @@ abstract class Importer {
 	
 
     /**
-     * get the fields of file/url to allow mapping
+     * get the metadata of file/url to allow mapping
      * should return an array
      *
      * Used when $manual_mapping is set to true, to build the mapping interface
      *
-     * @return array $fields_source the fields from the source
+     * @return array $metadata_source the metadata from the source
      */
-    public function get_source_fields() {}
+    public function get_source_metadata() {}
 		
     /**
      * get values for a single item
      *
      * @param  $index
-     * @return array with field_source's as the index and values for the
+     * @return array with metadatum_source's as the index and values for the
      * item
      *
-     * Ex: [ 'Field1' => 'value1', 'Field2' => [ 'value2','value3' ]
+     * Ex: [ 'Metadatum1' => 'value1', 'Metadatum2' => [ 'value2','value3' ]
      */
     abstract public function process_item( $index, $collection_id );
 
@@ -626,7 +626,7 @@ abstract class Importer {
     /**
      * insert processed item from source to Tainacan
      *
-     * @param array $processed_item Associative array with field source's as index with
+     * @param array $processed_item Associative array with metadatum source's as index with
      *                              its value or values
      * @return Tainacan\Entities\Item Item inserted
      */
@@ -641,7 +641,7 @@ abstract class Importer {
 		
 		$collection = \Tainacan\Repositories\Collections::get_instance()->fetch($collection_definition['id']);
 		
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
 
@@ -649,12 +649,12 @@ abstract class Importer {
         $itemMetadataArray = [];
 
         if( is_array( $processed_item ) ){
-            foreach ( $processed_item as $field_source => $values ){
-                $tainacan_field_id = array_search( $field_source, $collection_definition['map'] );
-                $field = $Tainacan_Fields->fetch( $tainacan_field_id );
+            foreach ( $processed_item as $metadatum_source => $values ){
+                $tainacan_metadatum_id = array_search( $metadatum_source, $collection_definition['map'] );
+                $metadatum = $Tainacan_Metadata->fetch( $tainacan_metadatum_id );
 
-                if( $field instanceof Entities\Field ){
-                    $singleItemMetadata = new Entities\Item_Metadata_Entity( $item, $field); // *empty item will be replaced by inserted in the next foreach
+                if( $metadatum instanceof Entities\Metadatum ){
+                    $singleItemMetadata = new Entities\Item_Metadata_Entity( $item, $metadatum); // *empty item will be replaced by inserted in the next foreach
                     $singleItemMetadata->set_value( $values );
                     $itemMetadataArray[] = $singleItemMetadata;
                 }
@@ -678,7 +678,7 @@ abstract class Importer {
                 if( $itemMetadata->validate() ){
                     $result = $Tainacan_Item_Metadata->insert( $itemMetadata );
                 } else {
-                    $this->add_error_log( 'Item ' . $insertedItem->get_id() . ' on field '. $itemMetadata->get_field()->get_name()
+                    $this->add_error_log( 'Item ' . $insertedItem->get_id() . ' on metadatum '. $itemMetadata->get_metadatum()->get_name()
                         .' has error ' . $itemMetadata->get_errors() );
                     continue;
                 }
@@ -686,7 +686,7 @@ abstract class Importer {
                 if( $result ){
                 	$values = ( is_array( $itemMetadata->get_value() ) ) ? implode( PHP_EOL, $itemMetadata->get_value() ) : $itemMetadata->get_value();
                     $this->add_log( 'Item ' . $insertedItem->get_id() .
-                        ' has inserted the values: ' . $values . ' on field: ' . $itemMetadata->get_field()->get_name() );
+                        ' has inserted the values: ' . $values . ' on metadatum: ' . $itemMetadata->get_metadatum()->get_name() );
                 } else {
                     $this->add_error_log( 'Item ' . $insertedItem->get_id() . ' has an error' );
                 }
diff --git a/src/importer/class-tainacan-old-tainacan.php b/src/importer/class-tainacan-old-tainacan.php
index 63891852e..6f6eb3794 100644
--- a/src/importer/class-tainacan-old-tainacan.php
+++ b/src/importer/class-tainacan-old-tainacan.php
@@ -178,20 +178,20 @@ class Old_Tainacan extends Importer{
         $repo_meta = wp_remote_get($repository_meta_link);
 
         $repo_meta_array = $this->verify_process_result($repo_meta);
-        $Fields_Repository = \Tainacan\Repositories\Fields::get_instance();
+        $Metadata_Repository = \Tainacan\Repositories\Metadata::get_instance();
         $created_categories = $this->read_from_file("categories");
         $relationships = $this->read_from_file("relationships");
 
-        $this->create_meta_repo($repo_meta_array, $Fields_Repository, $created_categories, $relationships);
+        $this->create_meta_repo($repo_meta_array, $Metadata_Repository, $created_categories, $relationships);
 
         return false;
     }
 
-    private function create_meta_repo($repo_meta_array, $Fields_Repository, $created_categories, $relationships, $compound_id = null)
+    private function create_meta_repo($repo_meta_array, $Metadata_Repository, $created_categories, $relationships, $compound_id = null)
     {
         if($repo_meta_array)
         {
-            $repository_fields = [];
+            $repository_metadata = [];
             foreach ($repo_meta_array as $meta)
             {
                 $special = [
@@ -201,24 +201,24 @@ class Old_Tainacan extends Importer{
 
                 if(!in_array($meta->slug, $this->avoid) && !in_array($meta->type, $special))
                 {
-                    $newField = $this->set_fields_properties($meta, $created_categories, $relationships, $Fields_Repository, $compound_id);
+                    $newMetadatum = $this->set_metadata_properties($meta, $created_categories, $relationships, $Metadata_Repository, $compound_id);
 
-                    if ($newField)
+                    if ($newMetadatum)
                     {
-                        $newField = $Fields_Repository->insert($newField);
-                        $repository_fields[] = $meta->id . "," . $newField->get_id() . "," . $meta->name;
+                        $newMetadatum = $Metadata_Repository->insert($newMetadatum);
+                        $repository_metadata[] = $meta->id . "," . $newMetadatum->get_id() . "," . $meta->name;
                     }
                 }
             }
 
-            $this->save_in_file('repository_fields', $repository_fields);
+            $this->save_in_file('repository_metadata', $repository_metadata);
         }
     }
 
     public function treat_collection_metas()
     {
         $created_collections = $this->read_from_file("collections");
-        $created_repository_fields = $this->read_from_file("repository_fields");
+        $created_repository_metadata = $this->read_from_file("repository_metadata");
         $created_categories = $this->read_from_file("categories");
         $relationships = $this->read_from_file("relationships");
 
@@ -227,8 +227,8 @@ class Old_Tainacan extends Importer{
         $inside_step_pointer = 0;
         $end = ( $created_collections ) ? count( $created_collections) : 0;
 
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-        $Fields_Repository = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+        $Metadata_Repository = \Tainacan\Repositories\Metadata::get_instance();
         $Repository_Collections = \Tainacan\Repositories\Collections::get_instance();
 
         //for($i = 0; $i < $inside_step_pointer; $i++)
@@ -244,9 +244,9 @@ class Old_Tainacan extends Importer{
             $collection = $Repository_Collections->fetch($new_collection_id);
             $this->set_actual_collection($collection);
 
-            $file_fields = $this->get_collection_fields($old_collection_id);
+            $file_metadata = $this->get_collection_metadata($old_collection_id);
 
-            $mapping = $this->create_collection_meta($file_fields, $Fields_Repository, $Tainacan_Fields, $created_repository_fields, $created_categories, $relationships);
+            $mapping = $this->create_collection_meta($file_metadata, $Metadata_Repository, $Tainacan_Metadata, $created_repository_metadata, $created_categories, $relationships);
 
             $this->add_collection([
                 'id' => $new_collection_id,
@@ -263,55 +263,55 @@ class Old_Tainacan extends Importer{
     }
 
     private function create_collection_meta(
-        $file_fields,
-        $Fields_Repository,
-        $Tainacan_Fields,
-        $created_repository_fields,
+        $file_metadata,
+        $Metadata_Repository,
+        $Tainacan_Metadata,
+        $created_repository_metadata,
         $created_categories,
         $relationships,
         $compound_id = null)
     {
-        if($file_fields)
+        if($file_metadata)
         {
-            foreach($file_fields as $index => $meta)
+            foreach($file_metadata as $index => $meta)
             {
                 $meta_slug = $meta->slug;
-                $old_field_id = $meta->id;
+                $old_metadatum_id = $meta->id;
 
-                if(!in_array($meta_slug, $this->avoid) && !isset($created_repository_fields[$old_field_id]))
+                if(!in_array($meta_slug, $this->avoid) && !isset($created_repository_metadata[$old_metadatum_id]))
                 {
-                    $newField = $this->set_fields_properties(
+                    $newMetadatum = $this->set_metadata_properties(
                         $meta,
                         $created_categories,
                         $relationships,
-                        $Fields_Repository,
+                        $Metadata_Repository,
                         $compound_id,
-                        $created_repository_fields,
+                        $created_repository_metadata,
                         false,
-                        $Tainacan_Fields);
+                        $Tainacan_Metadata);
 
-                    if($newField->validate())
+                    if($newMetadatum->validate())
                     {
-                        $newField = $Fields_Repository->insert($newField);
+                        $newMetadatum = $Metadata_Repository->insert($newMetadatum);
 
-                        $mapping[$newField->get_id()] = $file_fields[$index]->name;
+                        $mapping[$newMetadatum->get_id()] = $file_metadata[$index]->name;
                     }
-                }else /*Map to respository fields*/
+                }else /*Map to respository metadata*/
                 {
-                    if(isset($created_repository_fields[$old_field_id]))
+                    if(isset($created_repository_metadata[$old_metadatum_id]))
                     {
-                        $new_id = $created_repository_fields[$old_field_id]['new_id'];
-                        $mapping[$new_id] = $created_repository_fields[$old_field_id]['name'];
+                        $new_id = $created_repository_metadata[$old_metadatum_id]['new_id'];
+                        $mapping[$new_id] = $created_repository_metadata[$old_metadatum_id]['name'];
                     }else
                     {
-                        $fields = $Tainacan_Fields->fetch_by_collection( $this->actual_collection, [], 'OBJECT' );
+                        $metadata = $Tainacan_Metadata->fetch_by_collection( $this->actual_collection, [], 'OBJECT' );
 
-                        foreach ($fields as $field)
+                        foreach ($metadata as $metadatum)
                         {
-                            if(($field->WP_Post->post_name === 'title' || $field->WP_Post->post_name === 'description') &&
+                            if(($metadatum->WP_Post->post_name === 'title' || $metadatum->WP_Post->post_name === 'description') &&
                                 ($meta_slug === 'socialdb_property_fixed_title' || $meta_slug === 'socialdb_property_fixed_description'))
                             {
-                                $mapping[$field->get_id()] = $field->WP_Post->post_name;
+                                $mapping[$metadatum->get_id()] = $metadatum->WP_Post->post_name;
                             }
                         }
                     }
@@ -323,33 +323,33 @@ class Old_Tainacan extends Importer{
         return $mapping;
     }
 
-    private function set_fields_properties(
+    private function set_metadata_properties(
         $meta,
         $created_categories,
         $relationships,
-        $Fields_Repository,
+        $Metadata_Repository,
         $compound_id,
-        $created_repository_fields = null,
+        $created_repository_metadata = null,
         $is_repository = true,
-        $Tainacan_Fields = null)
+        $Tainacan_Metadata = null)
     {
-        $newField = new \Tainacan\Entities\Field();
+        $newMetadatum = new \Tainacan\Entities\Metadatum();
 
 
         $name = $meta->name;
         $type = $meta->type;
 
         $type = $this->define_type($type);
-        $newField->set_name($name);
+        $newMetadatum->set_name($name);
 
-        $newField->set_field_type('Tainacan\Field_Types\\'.$type);
+        $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\\'.$type);
         if(strcmp($type, "Category") === 0)
         {
             $taxonomy_id = $meta->metadata->taxonomy;
             if(isset($created_categories[$taxonomy_id]))
             {
                 $new_category_id = $created_categories[$taxonomy_id]['new_id'];
-                $newField->set_field_type_options(['taxonomy_id' => $new_category_id]);
+                $newMetadatum->set_metadatum_type_options(['taxonomy_id' => $new_category_id]);
             }
         }else if(strcmp($type, "Relationship") === 0)
         {
@@ -358,7 +358,7 @@ class Old_Tainacan extends Importer{
             if(isset($relationships[$taxonomy_id]))
             {
                 $new_collection_id = $relationships[$taxonomy_id]['new_id'];
-                $newField->set_field_type_options(['collection_id' => $new_collection_id]);
+                $newMetadatum->set_metadatum_type_options(['collection_id' => $new_collection_id]);
             }
         }else if(strcmp($type, "Compound") === 0)
         {
@@ -366,20 +366,20 @@ class Old_Tainacan extends Importer{
             {
                 $this->create_meta_repo(
                     $meta->metadata->children,
-                    $Fields_Repository,
+                    $Metadata_Repository,
                     $created_categories,
                     $relationships,
-                    $newField->get_id());
+                    $newMetadatum->get_id());
             }else
             {
                 $this->create_collection_meta(
                     $meta->metadata->children,
-                    $Fields_Repository,
-                    $Tainacan_Fields,
-                    $created_repository_fields,
+                    $Metadata_Repository,
+                    $Tainacan_Metadata,
+                    $created_repository_metadata,
                     $created_categories,
                     $relationships,
-                    $newField->get_id());
+                    $newMetadatum->get_id());
             }
         }
 
@@ -388,26 +388,26 @@ class Old_Tainacan extends Importer{
         {
             if($is_repository)
             {
-                $newField->set_collection_id('default');
+                $newMetadatum->set_collection_id('default');
             }else
             {
-                $newField->set_collection($this->actual_collection);
+                $newMetadatum->set_collection($this->actual_collection);
             }
-        }else //Set compound as field parent
+        }else //Set compound as metadatum parent
         {
-            $newField->set_parent($compound_id);
+            $newMetadatum->set_parent($compound_id);
         }
 
-        /*Properties of field*/
+        /*Properties of metadatum*/
         if(isset($meta->metadata))
         {
             if($meta->metadata->required == 1)
             {
-                $newField->set_required(true);
+                $newMetadatum->set_required(true);
             }
             if(!empty($meta->metadata->default_value))
             {
-                $newField->set_default_value($meta->metadata->default_value);
+                $newMetadatum->set_default_value($meta->metadata->default_value);
             }
             /*if(!empty($meta->metadata->text_help))
             {
@@ -417,13 +417,13 @@ class Old_Tainacan extends Importer{
             {
                 if($meta->metadata->cardinality > 1)
                 {
-                    $newField->set_multiple('yes');
+                    $newMetadatum->set_multiple('yes');
                 }
             }
         }
 
-        if($newField->validate()){
-            return $newField;
+        if($newMetadatum->validate()){
+            return $newMetadatum;
         }else return false;
     }
 
@@ -453,33 +453,33 @@ class Old_Tainacan extends Importer{
         unlink($this->get_id()."_categories.txt");
         unlink($this->get_id()."_collections.txt");
         unlink($this->get_id()."_relationships.txt");
-        unlink($this->get_id()."_repository_fields.txt");
+        unlink($this->get_id()."_repository_metadata.txt");
         return false;
     }
 
     /*Aux functions*/
-    private function get_collection_fields($collections_id)
+    private function get_collection_metadata($collections_id)
     {
-        $fields_link = $this->get_url() . $this->tainacan_api_address . "/collections/".$collections_id."/metadata";
-        $collection = wp_remote_get($fields_link);
+        $metadata_link = $this->get_url() . $this->tainacan_api_address . "/collections/".$collections_id."/metadata";
+        $collection = wp_remote_get($metadata_link);
 
         $collection_metadata = $this->verify_process_result($collection);
         if($collection_metadata)
         {
-            $fields = [];
+            $metadata = [];
             foreach ($collection_metadata[0]->{'tab-properties'} as $metadata)
             {
-                $field_details_link = $fields_link . "/". $metadata->id;
-                $field_details = wp_remote_get($field_details_link);
-                $field_details = $this->verify_process_result($field_details);
+                $metadatum_details_link = $metadata_link . "/". $metadata->id;
+                $metadatum_details = wp_remote_get($metadatum_details_link);
+                $metadatum_details = $this->verify_process_result($metadatum_details);
 
-                if($field_details)
+                if($metadatum_details)
                 {
-                    $fields[] = $field_details[0];
+                    $metadata[] = $metadatum_details[0];
                 }
             }
 
-            return $fields;
+            return $metadata;
         }
 
         return false;
@@ -692,15 +692,15 @@ class Old_Tainacan extends Importer{
      *
      * @param  $index
      * @param  $collection_id 
-     * @return array with field_source's as the index and values for the
+     * @return array with metadatum_source's as the index and values for the
      * item
      *
-     * Ex: [ 'Field1' => 'value1', 'Field2' => [ 'value2','value3' ]
+     * Ex: [ 'Metadatum1' => 'value1', 'Metadatum2' => [ 'value2','value3' ]
      */
     public function process_item( $index, $collection_id )
     {
         $processedItem = [];
-        $headers = $this->get_fields();
+        $headers = $this->get_metadata();
 
         // search the index in the file and get values
         /*$file =  new \SplFileObject( $this->tmp_file, 'r' );
@@ -744,14 +744,14 @@ class Old_Tainacan extends Importer{
         return false;
     }
 
-    public function create_fields_and_mapping()
+    public function create_metadata_and_mapping()
     {
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-        $fields_repository = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+        $metadata_repository = \Tainacan\Repositories\Metadata::get_instance();
 
-        $file_fields = $this->get_fields();
+        $file_metadata = $this->get_metadata();
 
-        foreach($file_fields as $index => $meta_info)
+        foreach($file_metadata as $index => $meta_info)
         {
             if(is_array($meta_info))
             {
@@ -766,26 +766,26 @@ class Old_Tainacan extends Importer{
 
             if(!in_array($meta_name, $this->avoid))
             {
-                $newField = new \Tainacan\Entities\Field();
+                $newMetadatum = new \Tainacan\Entities\Metadatum();
 
-                $newField->set_name($meta_name);
+                $newMetadatum->set_name($meta_name);
 
-                $newField->set_field_type('Tainacan\Field_Types\\'.$type);
+                $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\\'.$type);
 
-                $newField->set_collection($this->actual_collection);
-                $newField->validate(); // there is no user input here, so we can be sure it will validate.
+                $newMetadatum->set_collection($this->actual_collection);
+                $newMetadatum->validate(); // there is no user input here, so we can be sure it will validate.
 
-                $newField = $fields_repository->insert($newField);
+                $newMetadatum = $metadata_repository->insert($newMetadatum);
 
-                $mapping[$newField->get_id()] = $file_fields[$index];
+                $mapping[$newMetadatum->get_id()] = $file_metadata[$index];
             }else
             {
-                $fields = $Tainacan_Fields->fetch_by_collection( $this->collection, [], 'OBJECT' ) ;
-                foreach ($fields as $field)
+                $metadata = $Tainacan_Metadata->fetch_by_collection( $this->collection, [], 'OBJECT' ) ;
+                foreach ($metadata as $metadatum)
                 {
-                    if($field->WP_Post->post_name === 'title' || $field->WP_Post->post_name === 'description')
+                    if($metadatum->WP_Post->post_name === 'title' || $metadatum->WP_Post->post_name === 'description')
                     {
-                        $mapping[$field->get_id()] = $file_fields[$meta_name];
+                        $mapping[$metadatum->get_id()] = $file_metadata[$meta_name];
                     }
                 }
             }
@@ -794,7 +794,7 @@ class Old_Tainacan extends Importer{
         $this->set_mapping($mapping);
     }
 
-    public function get_fields()
+    public function get_metadata()
     {
 
     }
@@ -820,7 +820,7 @@ class Old_Tainacan extends Importer{
     * Method implemented by the child importer class to return the number of items to be imported
     * @return int
     */
-    public function get_source_fields(){
+    public function get_source_metadata(){
     }
     
 }
diff --git a/src/importer/class-tainacan-test-importer.php b/src/importer/class-tainacan-test-importer.php
index 9a661a935..8109a53cb 100644
--- a/src/importer/class-tainacan-test-importer.php
+++ b/src/importer/class-tainacan-test-importer.php
@@ -62,7 +62,7 @@ class Test_Importer extends Importer {
 		$this->tax_repo = \Tainacan\Repositories\Taxonomies::get_instance();
 		$this->col_repo = \Tainacan\Repositories\Collections::get_instance();
 		$this->items_repo = \Tainacan\Repositories\Items::get_instance();
-		$this->fields_repo = \Tainacan\Repositories\Fields::get_instance();
+		$this->metadata_repo = \Tainacan\Repositories\Metadata::get_instance();
 		
 	}
 	
@@ -107,42 +107,42 @@ class Test_Importer extends Importer {
 		$col1_map = [];
 		$col2_map = [];
 		
-		// fields 
+		// metadata
 		
-		// core fields
-		$col1_core_title = $col1->get_core_title_field();
-		$col1_core_description = $col1->get_core_description_field();
-		$col1_map[$col1_core_title->get_id()] = 'field1';
-		$col1_map[$col1_core_description->get_id()] = 'field2';
+		// core metadata
+		$col1_core_title = $col1->get_core_title_metadatum();
+		$col1_core_description = $col1->get_core_description_metadatum();
+		$col1_map[$col1_core_title->get_id()] = 'metadatum1';
+		$col1_map[$col1_core_description->get_id()] = 'metadatum2';
 		
-		$field = new Entities\Field();
-		$field->set_name('Color');
-		$field->set_collection($col1);
-		$field->set_field_type('Tainacan\Field_Types\Category');
-		$field->set_field_type_options([
+		$metadatum = new Entities\Metadatum();
+		$metadatum->set_name('Color');
+		$metadatum->set_collection($col1);
+		$metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category');
+		$metadatum->set_metadatum_type_options([
 			'taxonomy_id' => $this->get_transient('tax_1_id'),
 			'allow_new_terms' => true
 		]);
-		$field->set_status('publish');
-		$field->validate();
-		$field = $this->fields_repo->insert($field);
-		$col1_map[$field->get_id()] = 'field3';
-		$this->add_transient('tax_1_field', $field->get_id());
+		$metadatum->set_status('publish');
+		$metadatum->validate();
+		$metadatum = $this->metadata_repo->insert($metadatum);
+		$col1_map[$metadatum->get_id()] = 'metadatum3';
+		$this->add_transient('tax_1_metadatum', $metadatum->get_id());
 		
 		
-		$field = new Entities\Field();
-		$field->set_name('Quality');
-		$field->set_collection($col1);
-		$field->set_field_type('Tainacan\Field_Types\Category');
-		$field->set_field_type_options([
+		$metadatum = new Entities\Metadatum();
+		$metadatum->set_name('Quality');
+		$metadatum->set_collection($col1);
+		$metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category');
+		$metadatum->set_metadatum_type_options([
 			'taxonomy_id' => $this->get_transient('tax_2_id'),
 			'allow_new_terms' => true
 		]);
-		$field->set_status('publish');
-		$field->validate();
-		$field = $this->fields_repo->insert($field);
-		$col1_map[$field->get_id()] = 'field4';
-		$this->add_transient('tax_2_field', $field->get_id());
+		$metadatum->set_status('publish');
+		$metadatum->validate();
+		$metadatum = $this->metadata_repo->insert($metadatum);
+		$col1_map[$metadatum->get_id()] = 'metadatum4';
+		$this->add_transient('tax_2_metadatum', $metadatum->get_id());
 		
 		$this->add_collection([
 			'id' => $col1->get_id(),
@@ -152,20 +152,20 @@ class Test_Importer extends Importer {
 		]);
 		
 		// Collection 2
-		// core fields
-		$col2_core_title = $col2->get_core_title_field();
-		$col2_core_description = $col2->get_core_description_field();
-		$col2_map[$col2_core_title->get_id()] = 'field1';
-		$col2_map[$col2_core_description->get_id()] = 'field2';
+		// core metadata
+		$col2_core_title = $col2->get_core_title_metadatum();
+		$col2_core_description = $col2->get_core_description_metadatum();
+		$col2_map[$col2_core_title->get_id()] = 'metadatum1';
+		$col2_map[$col2_core_description->get_id()] = 'metadatum2';
 		
-		$field = new Entities\Field();
-		$field->set_name('Test Field');
-		$field->set_collection($col2);
-		$field->set_field_type('Tainacan\Field_Types\Text');
-		$field->set_status('publish');
-		$field->validate();
-		$field = $this->fields_repo->insert($field);
-		$col2_map[$field->get_id()] = 'field3';
+		$metadatum = new Entities\Metadatum();
+		$metadatum->set_name('Test Metadatum');
+		$metadatum->set_collection($col2);
+		$metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text');
+		$metadatum->set_status('publish');
+		$metadatum->validate();
+		$metadatum = $this->metadata_repo->insert($metadatum);
+		$col2_map[$metadatum->get_id()] = 'metadatum3';
 		
 		$this->add_collection([
 			'id' => $col2->get_id(),
@@ -191,19 +191,19 @@ class Test_Importer extends Importer {
 		$tax2 = $this->tax_repo->insert($tax2);
 		
 		
-		$field1 = $this->fields_repo->fetch( $this->get_transient('tax_1_field') );
-		$options = $field1->get_field_type_options();
+		$metadatum1 = $this->metadata_repo->fetch( $this->get_transient('tax_1_metadatum') );
+		$options = $metadatum1->get_metadatum_type_options();
 		$options['allow_new_terms'] = false;
-		$field1->set_field_type_options($options);
-		$field1->validate();
-		$this->fields_repo->insert($field1);
+		$metadatum1->set_metadatum_type_options($options);
+		$metadatum1->validate();
+		$this->metadata_repo->insert($metadatum1);
 		
-		$field2 = $this->fields_repo->fetch( $this->get_transient('tax_2_field') );
-		$options = $field2->get_field_type_options();
+		$metadatum2 = $this->metadata_repo->fetch( $this->get_transient('tax_2_metadatum') );
+		$options = $metadatum2->get_metadatum_type_options();
 		$options['allow_new_terms'] = false;
-		$field2->set_field_type_options($options);
-		$field2->validate();
-		$this->fields_repo->insert($field2);
+		$metadatum2->set_metadatum_type_options($options);
+		$metadatum2->validate();
+		$this->metadata_repo->insert($metadatum2);
 		
 	}
 	
@@ -256,17 +256,17 @@ class Test_Importer extends Importer {
 		];
 		
 		return [
-			'field1' => 'Title ' . $index,
-			'field2' => 'Description ' . $index,
-			'field3' => $terms1[array_rand($terms1)],
-			'field4' => $terms2[array_rand($terms2)],
+			'metadatum1' => 'Title ' . $index,
+			'metadatum2' => 'Description ' . $index,
+			'metadatum3' => $terms1[array_rand($terms1)],
+			'metadatum4' => $terms2[array_rand($terms2)],
 		];
 	}
 	public function get_col2_item($index) {
 		return [
-			'field1' => 'Collection 2 item ' . $index,
-			'field2' => 'Collection 2 item description ' . $index,
-			'field3' => 'Collection 2 whatever ' . $index,
+			'metadatum1' => 'Collection 2 item ' . $index,
+			'metadatum2' => 'Collection 2 item description ' . $index,
+			'metadatum3' => 'Collection 2 whatever ' . $index,
 		];
 	}
 	
diff --git a/src/js/event-bus-search.js b/src/js/event-bus-search.js
index f2cb9e00f..0a2138008 100644
--- a/src/js/event-bus-search.js
+++ b/src/js/event-bus-search.js
@@ -80,20 +80,20 @@ export default {
                         this.$store.dispatch('search/add_taxquery', data );
                     }
                 },
-                addFetchOnlyMeta( field ){
-                    this.$store.dispatch('search/add_fetchonly_meta', field );
+                addFetchOnlyMeta( metadatum ){
+                    this.$store.dispatch('search/add_fetchonly_meta', metadatum );
                     this.updateURLQueries();             
                 },
-                addFetchOnly( field ){
-                    this.$store.dispatch('search/add_fetchonly', field );
+                addFetchOnly( metadatum ){
+                    this.$store.dispatch('search/add_fetchonly', metadatum );
                     this.updateURLQueries();             
                 },
-                removeFetchOnlyMeta( field ){
-                    this.$store.dispatch('search/remove_fetchonly_meta', field );
+                removeFetchOnlyMeta( metadatum ){
+                    this.$store.dispatch('search/remove_fetchonly_meta', metadatum );
                     this.updateURLQueries();             
                 },
                 getErrors( filter_id ){
-                    let error = this.errors.find( errorItem => errorItem.field_id === filter_id );
+                    let error = this.errors.find( errorItem => errorItem.metadatum_id === filter_id );
                     return ( error ) ? error.errors : false;
                 },
                 listener(){
@@ -151,7 +151,7 @@ export default {
 
                     // Forces fetch_only to be filled before any search happens
                     if (this.$store.getters['search/getFetchOnly'] == undefined) {
-                        this.$emit( 'hasToPrepareFieldsAndFilters', to);
+                        this.$emit( 'hasToPrepareMetadataAndFilters', to);
                     } else {
                         this.$emit( 'isLoadingItems', true);
 
diff --git a/src/js/event-bus-web-components.js b/src/js/event-bus-web-components.js
index 4dea181e1..e4b16d043 100644
--- a/src/js/event-bus-web-components.js
+++ b/src/js/event-bus-web-components.js
@@ -27,7 +27,7 @@ export const eventBus = new Vue({
                     if (event.detail && event.detail[0] ){
                         this.updateValue({
                             item_id: $(eventElement).attr("item_id"),
-                            field_id: $(eventElement).attr("field_id"),
+                            metadatum_id: $(eventElement).attr("metadatum_id"),
                             values: event.detail
                         })
                     }
@@ -39,16 +39,16 @@ export const eventBus = new Vue({
                 
                 let values = ( Array.isArray( data.values[0] ) ) ? data.values[0] : data.values ;
                 const promisse = this.$store.dispatch('item/updateMetadata',
-                    { item_id: data.item_id, field_id: data.field_id, values: values });
+                    { item_id: data.item_id, metadatum_id: data.metadatum_id, values: values });
 
                     promisse.then( () => {
-                    let index = this.errors.findIndex( errorItem => errorItem.field_id == data.field_id );
+                    let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == data.metadatum_id );
                     if ( index >= 0){
                         this.errors.splice( index, 1);
                     }
                 })
                 .catch((error) => {
-                    let index = this.errors.findIndex( errorItem => errorItem.field_id == data.field_id );
+                    let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == data.metadatum_id );
                     let messages = [];
 
                     for (let index in error) {
@@ -56,25 +56,25 @@ export const eventBus = new Vue({
                     }
 
                     if ( index >= 0){
-                        Vue.set( this.errors, index, { field_id: data.field_id, errors: messages });
+                        Vue.set( this.errors, index, { metadatum_id: data.metadatum_id, errors: messages });
                     } else {
-                        this.errors.push( { field_id: data.field_id, errors: messages } );
+                        this.errors.push( { metadatum_id: data.metadatum_id, errors: messages } );
                     }
                 });
             }
         },
-        getErrors(field_id) {
-            let error = this.errors.find( errorItem => errorItem.field_id == field_id );
+        getErrors(metadatum_id) {
+            let error = this.errors.find( errorItem => errorItem.metadatum_id == metadatum_id );
             return ( error ) ? error.errors : false
         },
         clearAllErrors(){
            this.errors = [];
         },
         setValues(){
-            const field = this.$store.getters['item/getMetadata'];
-            if( field ){
-                for(let singleMetadata of field){
-                    const eventElement = this.getComponentById( singleMetadata.field_id );
+            const metadatum = this.$store.getters['item/getMetadata'];
+            if( metadatum ){
+                for(let singleMetadata of metadatum){
+                    const eventElement = this.getComponentById( singleMetadata.metadatum_id );
                     eventElement.value =  singleMetadata.values;
                 }
             }
@@ -97,12 +97,12 @@ export const eventBus = new Vue({
             }
             return components;
         },
-        getComponentById( field_id ){
+        getComponentById( metadatum_id ){
             for( let component of this.componentsTag ){
                 const eventElements = document.getElementsByTagName( component );
                 if( eventElements ) {
                     for (let eventElement of eventElements){
-                        if( eventElement.field_id === field_id ){
+                        if( eventElement.metadatum_id === metadatum_id ){
                             return eventElement;
                         }
                     }
diff --git a/src/js/main.js b/src/js/main.js
index 22c5bb415..a5747e0f1 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -10,14 +10,14 @@ Vue.use(Buefy);
 
 Vue.use(VueCustomElement);
 
-import Text from '../classes/field-types/text/Text.vue';
-import Textarea from '../classes/field-types/textarea/Textarea.vue';
-import Selectbox from '../classes/field-types/selectbox/Selectbox.vue';
-import Numeric from '../classes/field-types/numeric/Numeric.vue';
-import Date from '../classes/field-types/date/Date.vue';
-import Relationship from '../classes/field-types/relationship/Relationship.vue';
+import Text from '../classes/metadatum-types/text/Text.vue';
+import Textarea from '../classes/metadatum-types/textarea/Textarea.vue';
+import Selectbox from '../classes/metadatum-types/selectbox/Selectbox.vue';
+import Numeric from '../classes/metadatum-types/numeric/Numeric.vue';
+import Date from '../classes/metadatum-types/date/Date.vue';
+import Relationship from '../classes/metadatum-types/relationship/Relationship.vue';
 
-import FormRelationship from '../classes/field-types/relationship/FormRelationship.vue';
+import FormRelationship from '../classes/metadatum-types/relationship/FormRelationship.vue';
 
 import FilterCustomInterval from '../classes/filter-types/custom-interval/CustomInterval.vue';
 import FilterSelectbox from '../classes/filter-types/selectbox/Selectbox.vue';
diff --git a/src/js/store/modules/collection/mutations.js b/src/js/store/modules/collection/mutations.js
index 6c67d12a5..dfb9c012a 100644
--- a/src/js/store/modules/collection/mutations.js
+++ b/src/js/store/modules/collection/mutations.js
@@ -52,7 +52,7 @@ export const cleanCollectionName = (state) => {
 export const setSingleAttachment = ( state, attachment ) => {
     let index = state.attachments.findIndex(newAttachment => newAttachment.id === attachment.id);
     if ( index >= 0){
-        //state.field[index] = field;
+        //state.metadatum[index] = metadatum;
         Vue.set( state.attachments, index, attachment );
     } else {
         state.attachments.push( attachment );
diff --git a/src/js/store/modules/fields/getters.js b/src/js/store/modules/fields/getters.js
deleted file mode 100644
index e097e2b6a..000000000
--- a/src/js/store/modules/fields/getters.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const getFields = state => {  
-    
-    return state.fields;
-}
-
-export const getFieldTypes = state => {
-    return state.fieldTypes;
-}
-
-export const getFieldMappers = state => {
-    return state.fieldMappers;
-}
\ No newline at end of file
diff --git a/src/js/store/modules/fields/mutations.js b/src/js/store/modules/fields/mutations.js
deleted file mode 100644
index 9548fdf99..000000000
--- a/src/js/store/modules/fields/mutations.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Vue from 'vue';
-
-export const deleteField = ( state, field ) => {
-    let index = state.fields.findIndex(deletedField => deletedField.id == field.id);
-    if (index >= 0) {
-        state.fields.splice(index, 1);
-    }
-}
-
-export const setSingleField = (state, {field, index}) => {
-    Vue.set( state.fields, index, field);
-}
-
-export const setFields = (state, fields) => {
-    state.fields = fields;
-}
-
-export const setFieldTypes = (state, fieldTypes) => {
-    state.fieldTypes = fieldTypes;
-}
-
-export const setFieldMappers = (state, fieldMappers) => {
-    state.fieldMappers = fieldMappers;
-}
diff --git a/src/js/store/modules/filter/actions.js b/src/js/store/modules/filter/actions.js
index 9ae81fc4a..8caeb9680 100644
--- a/src/js/store/modules/filter/actions.js
+++ b/src/js/store/modules/filter/actions.js
@@ -32,11 +32,11 @@ export const fetchFilters = ({ commit }, {collectionId, isRepositoryLevel, isCon
     });
 };
 
-export const sendFilter = ( { commit }, { collectionId, fieldId, name, filterType, status, isRepositoryLevel, newIndex }) => {
+export const sendFilter = ( { commit }, { collectionId, metadatumId, name, filterType, status, isRepositoryLevel, newIndex }) => {
     return new Promise(( resolve, reject ) => {
         let endpoint = '';
         if (!isRepositoryLevel) 
-            endpoint = '/collection/' + collectionId + '/field/' + fieldId +'/filters/'; 
+            endpoint = '/collection/' + collectionId + '/metadatum/' + metadatumId +'/filters/';
         else
             endpoint = '/filters/';
 
@@ -46,7 +46,7 @@ export const sendFilter = ( { commit }, { collectionId, fieldId, name, filterTyp
                 name: name,
                 status: status
             },
-            field: fieldId,
+            metadatum: metadatumId,
         })
             .then( res => {
                 let filter = res.data;
diff --git a/src/js/store/modules/item/actions.js b/src/js/store/modules/item/actions.js
index 0a9c51d9c..69e91c03b 100644
--- a/src/js/store/modules/item/actions.js
+++ b/src/js/store/modules/item/actions.js
@@ -1,13 +1,13 @@
 import axios from '../../../axios/axios';
 
-// Actions related to Item's field
-export const sendField = ( { commit }, { item_id, field_id, values }) => {
+// Actions related to Item's metadatum
+export const sendMetadatum = ( { commit }, { item_id, metadatum_id, values }) => {
    return new Promise( (resolve, reject) => {
-        axios.tainacan.post('/item/'+item_id+'/metadata/'+field_id, {
+        axios.tainacan.post('/item/'+item_id+'/metadata/'+metadatum_id, {
             values: values
         })
         .then( res => {
-            commit('setSingleMetadata', { item_id: item_id, field_id: field_id, values: values });
+            commit('setSingleMetadata', { item_id: item_id, metadatum_id: metadatum_id, values: values });
             resolve( res.data );
         })
         .catch(error => {
@@ -17,15 +17,15 @@ export const sendField = ( { commit }, { item_id, field_id, values }) => {
 };
 
 
-export const updateMetadata = ({ commit }, { item_id, field_id, values }) => {
+export const updateMetadata = ({ commit }, { item_id, metadatum_id, values }) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.patch(`/item/${item_id}/metadata/${field_id}`, {
+        axios.tainacan.patch(`/item/${item_id}/metadata/${metadatum_id}`, {
             values: values,
         })
             .then( res => {
-                let field = res.data;
-                commit('setSingleField', field);
-                resolve(field)
+                let metadatum = res.data;
+                commit('setSingleMetadatum', metadatum);
+                resolve(metadatum)
             })
             .catch( error => {
                 reject(error.response.data.errors);
@@ -33,14 +33,14 @@ export const updateMetadata = ({ commit }, { item_id, field_id, values }) => {
     });
 };
 
-export const fetchFields = ({ commit }, item_id) => {
-    commit('cleanFields');
+export const fetchMetadata = ({ commit }, item_id) => {
+    commit('cleanMetadata');
     return new Promise((resolve, reject) => {
         axios.tainacan.get('/item/'+item_id+'/metadata')
         .then(res => {
-            let fields = res.data;
-            commit('setFields', fields);
-            resolve( fields );
+            let metadata = res.data;
+            commit('setMetadata', metadata);
+            resolve( metadata );
         })
         .catch(error => {
             reject( error );
@@ -48,8 +48,8 @@ export const fetchFields = ({ commit }, item_id) => {
     });
 };
 
-export const cleanFields = ({ commit }) => {
-    commit('cleanFields');
+export const cleanMetadata = ({ commit }) => {
+    commit('cleanMetadata');
 };
 
 // Actions directly related to Item
diff --git a/src/js/store/modules/item/getters.js b/src/js/store/modules/item/getters.js
index b0e4d3fc3..e109f9766 100644
--- a/src/js/store/modules/item/getters.js
+++ b/src/js/store/modules/item/getters.js
@@ -1,5 +1,5 @@
-export const getFields =  state => {
-    return state.fields;
+export const getMetadata =  state => {
+    return state.metadata;
 }
 
 export const getItem = state => {
diff --git a/src/js/store/modules/item/index.js b/src/js/store/modules/item/index.js
index f186c34fe..b5e960804 100644
--- a/src/js/store/modules/item/index.js
+++ b/src/js/store/modules/item/index.js
@@ -4,7 +4,7 @@ import * as mutations from './mutations';
 
 const state = {
     item: [],
-    fields: [],
+    metadata: [],
     error: [],
     itemTitle: '',
     attachment: {},
diff --git a/src/js/store/modules/item/mutations.js b/src/js/store/modules/item/mutations.js
index 3d5609cd5..e131aea76 100644
--- a/src/js/store/modules/item/mutations.js
+++ b/src/js/store/modules/item/mutations.js
@@ -11,7 +11,7 @@ export const cleanItem = ( state ) => {
 export const setSingleAttachment = ( state, attachment ) => {
     let index = state.attachments.findIndex(newAttachment => newAttachment.id === attachment.id);
     if ( index >= 0){
-        //state.field[index] = field;
+        //state.metadatum[index] = metadatum;
         Vue.set( state.attachments, index, attachment );
     } else {
         state.attachments.push( attachment );
@@ -38,20 +38,20 @@ export const cleanItemTitle = ( state ) => {
     state.itemTitle = '';
 }
 
-export const setFields = ( state, fields) => {
-    state.fields = fields;
+export const setMetadata = ( state, metadata) => {
+    state.metadata = metadata;
 }
 
-export const cleanFields = (state) => {
-    state.fields = [];
+export const cleanMetadata = (state) => {
+    state.metadata = [];
 }
 
-export const setSingleField = ( state, field) => {
-    let index = state.fields.findIndex(itemMetadata => itemMetadata.field.id === field.field.id);
+export const setSingleMetadatum = ( state, metadatum) => {
+    let index = state.metadata.findIndex(itemMetadata => itemMetadata.metadatum.id === metadatum.metadatum.id);
     if ( index >= 0){
-        //state.field[index] = field;
-        Vue.set( state.fields, index, field );
+        //state.metadatum[index] = metadatum;
+        Vue.set( state.metadata, index, metadatum );
     } else {
-        state.fields.push( field );
+        state.metadata.push( metadatum );
     }
 }
diff --git a/src/js/store/modules/fields/actions.js b/src/js/store/modules/metadata/actions.js
similarity index 50%
rename from src/js/store/modules/fields/actions.js
rename to src/js/store/modules/metadata/actions.js
index fffbbe909..c962c929c 100644
--- a/src/js/store/modules/fields/actions.js
+++ b/src/js/store/modules/metadata/actions.js
@@ -1,23 +1,23 @@
 import axios from '../../../axios/axios';
 import qs from 'qs';
 
-export const fetchFields = ({commit}, {collectionId, isRepositoryLevel, isContextEdit}) => {
+export const fetchMetadata = ({commit}, {collectionId, isRepositoryLevel, isContextEdit}) => {
     return new Promise((resolve, reject) => {
         let endpoint = '';
         if (!isRepositoryLevel)
-            endpoint = '/collection/' + collectionId + '/fields/';
+            endpoint = '/collection/' + collectionId + '/metadata/';
         else
-            endpoint = '/fields/';
+            endpoint = '/metadata/';
 
-        endpoint += '?nopaging=1'
+        endpoint += '?nopaging=1';
         if (isContextEdit)
             endpoint += '&context=edit';
 
         axios.tainacan.get(endpoint)
             .then((res) => {
-                let fields = res.data;
-                commit('setFields', fields);
-                resolve(fields);
+                let metadata = res.data;
+                commit('setMetadata', metadata);
+                resolve(metadata);
             })
             .catch((error) => {
                 console.log(error);
@@ -26,21 +26,21 @@ export const fetchFields = ({commit}, {collectionId, isRepositoryLevel, isContex
     });
 };
 
-export const sendField = ({commit}, {collectionId, name, fieldType, status, isRepositoryLevel, newIndex}) => {
+export const sendMetadatum = ({commit}, {collectionId, name, metadatumType, status, isRepositoryLevel, newIndex}) => {
     return new Promise((resolve, reject) => {
         let endpoint = '';
         if (!isRepositoryLevel)
-            endpoint = '/collection/' + collectionId + '/fields/';
+            endpoint = '/collection/' + collectionId + '/metadata/';
         else
-            endpoint = '/fields/';
+            endpoint = '/metadata/';
         axios.tainacan.post(endpoint + '?context=edit', {
             name: name,
-            field_type: fieldType,
+            metadatum_type: metadatumType,
             status: status
         })
             .then(res => {
-                let field = res.data;
-                commit('setSingleField', {field: field, index: newIndex});
+                let metadatum = res.data;
+                commit('setSingleMetadatum', {metadatum: metadatum, index: newIndex});
                 resolve(res.data);
             })
             .catch(error => {
@@ -49,20 +49,20 @@ export const sendField = ({commit}, {collectionId, name, fieldType, status, isRe
     });
 };
 
-export const updateField = ({commit}, {collectionId, fieldId, isRepositoryLevel, index, options}) => {
+export const updateMetadatum = ({commit}, {collectionId, metadatumId, isRepositoryLevel, index, options}) => {
     return new Promise((resolve, reject) => {
         let endpoint = '';
 
         if (!isRepositoryLevel)
-            endpoint = '/collection/' + collectionId + '/fields/' + fieldId;
+            endpoint = '/collection/' + collectionId + '/metadata/' + metadatumId;
         else
-            endpoint = '/fields/' + fieldId;
+            endpoint = '/metadata/' + metadatumId;
 
         axios.tainacan.put(endpoint + '?context=edit', options)
             .then(res => {
-                let field = res.data;
-                commit('setSingleField', {field: field, index: index});
-                resolve(field);
+                let metadatum = res.data;
+                commit('setSingleMetadatum', {metadatum: metadatum, index: index});
+                resolve(metadatum);
             })
             .catch(error => {
                 reject({
@@ -73,21 +73,21 @@ export const updateField = ({commit}, {collectionId, fieldId, isRepositoryLevel,
     });
 };
 
-export const updateFields = ({commit}, fields) => {
-    commit('setFields', fields);
+export const updateMetadata = ({commit}, metadata) => {
+    commit('setMetadata', metadata);
 };
 
-export const deleteField = ({commit}, {collectionId, fieldId, isRepositoryLevel}) => {
+export const deleteMetadatum = ({commit}, {collectionId, metadatumId, isRepositoryLevel}) => {
     let endpoint = '';
     if (!isRepositoryLevel)
-        endpoint = '/collection/' + collectionId + '/fields/' + fieldId;
+        endpoint = '/collection/' + collectionId + '/metadata/' + metadatumId;
     else
-        endpoint = '/fields/' + fieldId;
+        endpoint = '/metadata/' + metadatumId;
 
     return new Promise((resolve, reject) => {
         axios.tainacan.delete(endpoint)
             .then(res => {
-                commit('deleteField', res.data);
+                commit('deleteMetadatum', res.data);
                 resolve(res.data);
             }).catch((error) => {
             console.log(error);
@@ -97,10 +97,10 @@ export const deleteField = ({commit}, {collectionId, fieldId, isRepositoryLevel}
     });
 };
 
-export const updateCollectionFieldsOrder = ({ dispatch }, {collectionId, fieldsOrder}) => {
+export const updateCollectionMetadataOrder = ({ dispatch }, {collectionId, metadataOrder}) => {
     return new Promise((resolve, reject) => {
         axios.tainacan.patch('/collections/' + collectionId, {
-            fields_order: fieldsOrder
+            metadata_order: metadataOrder
         }).then(res => {
             //dispatch('collection/setCollection', res.data, {root: true});
             resolve(res.data);
@@ -111,13 +111,13 @@ export const updateCollectionFieldsOrder = ({ dispatch }, {collectionId, fieldsO
     });
 }
 
-export const fetchFieldTypes = ({commit}) => {
+export const fetchMetadatumTypes = ({commit}) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.get('/field-types')
+        axios.tainacan.get('/metadatum-types')
             .then((res) => {
-                let fieldTypes = res.data;
-                commit('setFieldTypes', fieldTypes);
-                resolve(fieldTypes);
+                let metadatumTypes = res.data;
+                commit('setMetadatumTypes', metadatumTypes);
+                resolve(metadatumTypes);
             })
             .catch((error) => {
                 console.log(error);
@@ -126,17 +126,17 @@ export const fetchFieldTypes = ({commit}) => {
     });
 }
 
-export const updateFieldTypes = ({commit}, fieldTypes) => {
-    commit('setFieldTypes', fieldTypes);
+export const updateMetadatumTypes = ({commit}, metadatumTypes) => {
+    commit('setMetadatumTypes', metadatumTypes);
 };
 
-export const fetchFieldMappers = ({commit}) => {
+export const fetchMetadatumMappers = ({commit}) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.get('/field-mappers')
+        axios.tainacan.get('/metadatum-mappers')
             .then((res) => {
-                let fieldMappers = res.data;
-                commit('setFieldMappers', fieldMappers);
-                resolve(fieldMappers);
+                let metadatumMappers = res.data;
+                commit('setMetadatumMappers', metadatumMappers);
+                resolve(metadatumMappers);
             })
             .catch((error) => {
                 console.log(error);
@@ -145,6 +145,6 @@ export const fetchFieldMappers = ({commit}) => {
     });
 }
 
-export const updateFieldMappers = ({commit}, fieldMappers) => {
-    commit('setFieldMappers', fieldMappers);
+export const updatemetadatumMappers = ({commit}, metadatumMappers) => {
+    commit('setmetadatumMappers', metadatumMappers);
 };
diff --git a/src/js/store/modules/metadata/getters.js b/src/js/store/modules/metadata/getters.js
new file mode 100644
index 000000000..24ffd903e
--- /dev/null
+++ b/src/js/store/modules/metadata/getters.js
@@ -0,0 +1,12 @@
+export const getMetadata = state => {
+    
+    return state.metadata;
+}
+
+export const getMetadatumTypes = state => {
+    return state.metadatumTypes;
+}
+
+export const getMetadatumMappers = state => {
+    return state.metadatumMappers;
+}
\ No newline at end of file
diff --git a/src/js/store/modules/fields/index.js b/src/js/store/modules/metadata/index.js
similarity index 76%
rename from src/js/store/modules/fields/index.js
rename to src/js/store/modules/metadata/index.js
index 8e4294fc3..0a46422ba 100644
--- a/src/js/store/modules/fields/index.js
+++ b/src/js/store/modules/metadata/index.js
@@ -3,9 +3,9 @@ import * as getters from './getters';
 import * as mutations from './mutations';
 
 const state = {
-    fields: [],
-    fieldTypes: [],
-    fieldMappers: [],
+    metadata: [],
+    metadatumTypes: [],
+    metadatumMappers: [],
 };
 
 export default {
diff --git a/src/js/store/modules/metadata/mutations.js b/src/js/store/modules/metadata/mutations.js
new file mode 100644
index 000000000..fdb49fbf9
--- /dev/null
+++ b/src/js/store/modules/metadata/mutations.js
@@ -0,0 +1,24 @@
+import Vue from 'vue';
+
+export const deleteMetadatum = ( state, metadatum ) => {
+    let index = state.metadata.findIndex(deletedMetadatum => deletedMetadatum.id == metadatum.id);
+    if (index >= 0) {
+        state.metadata.splice(index, 1);
+    }
+}
+
+export const setSingleMetadatum = (state, {metadatum, index}) => {
+    Vue.set( state.metadata, index, metadatum);
+}
+
+export const setMetadata = (state, metadata) => {
+    state.metadata = metadata;
+}
+
+export const setMetadatumTypes = (state, metadatumTypes) => {
+    state.metadatumTypes = metadatumTypes;
+}
+
+export const setMetadatumMappers = (state, metadatumMappers) => {
+    state.metadatumMappers = metadatumMappers;
+}
diff --git a/src/js/store/modules/search/actions.js b/src/js/store/modules/search/actions.js
index fd083303a..2c889f083 100644
--- a/src/js/store/modules/search/actions.js
+++ b/src/js/store/modules/search/actions.js
@@ -21,19 +21,19 @@ export const add_metaquery = ( { commit }, filter  ) => {
 };
 
 // Fetch Only for item attributes limiting on results
-export const add_fetchonly = ( { commit }, field ) => {
-        commit('addFetchOnly', field );   
+export const add_fetchonly = ( { commit }, metadatum ) => {
+        commit('addFetchOnly', metadatum );
 };
-export const remove_fetchonly = ( { commit }, field ) => {
-    commit('removeFetchOnly', field );
+export const remove_fetchonly = ( { commit }, metadatum ) => {
+    commit('removeFetchOnly', metadatum );
 };
 
 // Fetch Only for metadata limiting on results
-export const add_fetchonly_meta = ( { commit }, field ) => {
-    commit('addFetchOnlyMeta', field );
+export const add_fetchonly_meta = ( { commit }, metadatum ) => {
+    commit('addFetchOnlyMeta', metadatum );
 };
-export const remove_fetchonly_meta = ( { commit }, field ) => {
-    commit('removeFetchOnlyMeta', field );
+export const remove_fetchonly_meta = ( { commit }, metadatum ) => {
+    commit('removeFetchOnlyMeta', metadatum );
 };
 
 // Tax Queries from filters
@@ -77,15 +77,15 @@ export const setOrderBy = ({ commit }, orderBy ) => {
         commit('setPostQueryAttribute', {  attr: 'orderby', value: 'date' } );
     } else if (orderBy.id == 'author_name') {
         commit('setPostQueryAttribute', {  attr: 'orderby', value: 'author_name' } );
-    } else if (orderBy.field_type_object.primitive_type == 'float' || orderBy.field_type_object.primitive_type == 'int') {
+    } else if (orderBy.metadatum_type_object.primitive_type == 'float' || orderBy.metadatum_type_object.primitive_type == 'int') {
         commit('setPostQueryAttribute', {  attr: 'meta_key', value: orderBy.id } );
         commit('setPostQueryAttribute', {  attr: 'orderby', value: 'meta_value_num' } );
-    } else if (orderBy.field_type_object.primitive_type == 'date') {
+    } else if (orderBy.metadatum_type_object.primitive_type == 'date') {
         commit('setPostQueryAttribute', {  attr: 'meta_key', value: orderBy.id } );
         commit('setPostQueryAttribute', {  attr: 'meta_type', value: 'DATETIME' } );
         commit('setPostQueryAttribute', {  attr: 'orderby', value: 'meta_value' } );
-    } else if (orderBy.field_type_object.core) {
-        commit('setPostQueryAttribute', {  attr: 'orderby', value: orderBy.field_type_object.related_mapped_prop } );
+    } else if (orderBy.metadatum_type_object.core) {
+        commit('setPostQueryAttribute', {  attr: 'orderby', value: orderBy.metadatum_type_object.related_mapped_prop } );
     } else {
         commit('setPostQueryAttribute', {  attr: 'meta_key', value: orderBy.id } );
         commit('setPostQueryAttribute', {  attr: 'orderby', value: 'meta_value' } );
diff --git a/src/js/store/modules/search/mutations.js b/src/js/store/modules/search/mutations.js
index df34cac33..0bd1e8cef 100644
--- a/src/js/store/modules/search/mutations.js
+++ b/src/js/store/modules/search/mutations.js
@@ -15,18 +15,18 @@ export const setAdvancedSearchQuery = (state, advancedSearchQuery) => {
 export const addMetaQuery = ( state, filter ) => {
     state.postquery.metaquery = ( ! state.postquery.metaquery ) ? [] : state.postquery.metaquery;
 
-    let index = state.postquery.metaquery.findIndex( item => item.key === filter.field_id);
+    let index = state.postquery.metaquery.findIndex( item => item.key === filter.metadatum_id);
 
     if ( index >= 0 ){
         Vue.set( state.postquery.metaquery, index, {
-            key: filter.field_id,
+            key: filter.metadatum_id,
             value: filter.value,
             compare: filter.compare,
             type: filter.type
         } );
     } else{
         state.postquery.metaquery.push({
-            key: filter.field_id,
+            key: filter.metadatum_id,
             value: filter.value,
             compare: filter.compare,
             type: filter.type
@@ -52,37 +52,37 @@ export const addTaxQuery = ( state, filter ) => {
     }
 };
 
-export const addFetchOnly = ( state, field ) => {
+export const addFetchOnly = ( state, metadatum ) => {
     state.postquery.fetch_only = ( ! state.postquery.fetch_only ) ? { '0': 'thumbnail', 'meta': [], '1': 'creation_date', '2': 'author_name' } : state.postquery.fetch_only;
 
-    for (let key in field) {
-        state.postquery.fetch_only[key] = field[key];
+    for (let key in metadatum) {
+        state.postquery.fetch_only[key] = metadatum[key];
     }
 };
-export const addFetchOnlyMeta = ( state, field ) => {
+export const addFetchOnlyMeta = ( state, metadatum ) => {
     state.postquery.fetch_only = ( ! state.postquery.fetch_only ) ? { '0': 'thumbnail', 'meta': [], '1': 'creation_date', '2': 'author_name' } : state.postquery.fetch_only;
    // console.log(state.postquery.fetch_only);
     //console.log(state.postquery.fetch_only['meta']);
     state.postquery.fetch_only['meta'] = ( ! state.postquery.fetch_only['meta'] ) ? [] : state.postquery.fetch_only['meta'];
-    let index = state.postquery.fetch_only['meta'].findIndex( item => item == field);
+    let index = state.postquery.fetch_only['meta'].findIndex( item => item == metadatum);
     if ( index >= 0 ){    
-        state.postquery.fetch_only['meta'][index] = field;
+        state.postquery.fetch_only['meta'][index] = metadatum;
     } else {
-        state.postquery.fetch_only['meta'].push(field);
+        state.postquery.fetch_only['meta'].push(metadatum);
     }
     //console.log(state.postquery.fetch_only['meta']);
     //console.log("----------------------------");
 };
 
-export const removeFetchOnly = ( state, field ) => {
-    for (let key in field) {
+export const removeFetchOnly = ( state, metadatum ) => {
+    for (let key in metadatum) {
         delete state.postquery.fetch_only[key];
     }
 };
 
-export const removeFetchOnlyMeta = ( state, field ) => {
+export const removeFetchOnlyMeta = ( state, metadatum ) => {
     if(state.postquery.fetch_only['meta'] != undefined) {
-        let index = state.postquery.fetch_only['meta'].findIndex( item => item == field);
+        let index = state.postquery.fetch_only['meta'].findIndex( item => item == metadatum);
         if (index >= 0) {
             state.postquery.fetch_only['meta'].splice(index, 1);
         }
@@ -91,7 +91,7 @@ export const removeFetchOnlyMeta = ( state, field ) => {
 
 export const removeMetaQuery = ( state, filter ) => {
     state.postquery.metaquery = ( ! state.postquery.metaquery ) ? [] : state.postquery.metaquery;
-    let index = state.postquery.metaquery.findIndex( item => item.key === filter.field_id);
+    let index = state.postquery.metaquery.findIndex( item => item.key === filter.metadatum_id);
     if (index >= 0) {
         state.postquery.metaquery.splice(index, 1);
     }
diff --git a/src/js/store/store.js b/src/js/store/store.js
index c48e2fedd..0f29ed174 100644
--- a/src/js/store/store.js
+++ b/src/js/store/store.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex';
 
 import item from './modules/item/';
 import collection from './modules/collection/';
-import fields from './modules/fields/';
+import metadata from './modules/metadata/';
 import filter from './modules/filter/';
 import search from './modules/search/';
 import category from './modules/category/';
@@ -23,7 +23,7 @@ export default new Vuex.Store({
     modules: {
         item,
         collection,
-        fields,
+        metadata,
         filter,
         search,
         category,
diff --git a/src/languages/tainacan-pt_BR.po b/src/languages/tainacan-pt_BR.po
index 0fd7c478f..a64ba4fa9 100644
--- a/src/languages/tainacan-pt_BR.po
+++ b/src/languages/tainacan-pt_BR.po
@@ -44,9 +44,9 @@ msgid "Items"
 msgstr "Itens"
 
 #: admin/tainacan-admin-i18n.php:8 admin/tainacan-admin-i18n.php:14
-#: classes/repositories/class-tainacan-fields.php:194
-#: classes/repositories/class-tainacan-fields.php:195
-#: classes/repositories/class-tainacan-fields.php:205
+#: classes/repositories/class-tainacan-metadata.php:194
+#: classes/repositories/class-tainacan-metadata.php:195
+#: classes/repositories/class-tainacan-metadata.php:205
 #: classes/repositories/class-tainacan-filters.php:83
 #: dev-interface/class-tainacan-dev-interface.php:93
 #: dev-interface/class-tainacan-dev-interface.php:236
@@ -72,7 +72,7 @@ msgstr "Eventos"
 
 #: admin/tainacan-admin-i18n.php:12
 #: classes/repositories/class-tainacan-collections.php:200
-#: classes/repositories/class-tainacan-fields.php:154
+#: classes/repositories/class-tainacan-metadata.php:154
 #: classes/repositories/class-tainacan-filters.php:69
 #: classes/repositories/class-tainacan-items.php:58
 msgid "Collection"
@@ -226,7 +226,7 @@ msgstr "Página de Itens"
 
 #: admin/tainacan-admin-i18n.php:55
 #, fuzzy
-#| msgid "Repository Fields Page"
+#| msgid "Repository Metadata Page"
 msgid "Repository Metadata Page"
 msgstr "Página de metadados do repositório"
 
@@ -321,7 +321,7 @@ msgstr "Página de edição de filtro"
 
 #: admin/tainacan-admin-i18n.php:78
 #, fuzzy
-#| msgid "Field Edition Page"
+#| msgid "Metadatum Edition Page"
 msgid "Metadata Edition Page"
 msgstr "Página de edição de metadado"
 
@@ -375,7 +375,7 @@ msgstr "Ações"
 
 #: admin/tainacan-admin-i18n.php:92
 #: classes/repositories/class-tainacan-collections.php:41
-#: classes/repositories/class-tainacan-fields.php:46
+#: classes/repositories/class-tainacan-metadata.php:46
 #: classes/repositories/class-tainacan-filters.php:31
 #: classes/repositories/class-tainacan-taxonomies.php:38
 #: classes/repositories/class-tainacan-terms.php:41
@@ -384,7 +384,7 @@ msgstr "Nome"
 
 #: admin/tainacan-admin-i18n.php:93
 #: classes/repositories/class-tainacan-collections.php:87
-#: classes/repositories/class-tainacan-fields.php:78
+#: classes/repositories/class-tainacan-metadata.php:78
 #: classes/repositories/class-tainacan-filters.php:46
 #: classes/repositories/class-tainacan-items.php:50
 #: classes/repositories/class-tainacan-logs.php:70
@@ -403,7 +403,7 @@ msgstr "Status"
 
 #: admin/tainacan-admin-i18n.php:95
 #: classes/repositories/class-tainacan-collections.php:95
-#: classes/repositories/class-tainacan-fields.php:54
+#: classes/repositories/class-tainacan-metadata.php:54
 #: classes/repositories/class-tainacan-logs.php:78
 #: classes/repositories/class-tainacan-taxonomies.php:54
 msgid "Slug"
@@ -498,7 +498,7 @@ msgstr "Metadado"
 
 #: admin/tainacan-admin-i18n.php:116
 #, fuzzy
-#| msgid "Available Field Types"
+#| msgid "Available Metadatum Types"
 msgid "Available Metadata Types"
 msgstr "Tipos de Metadados disponíveis"
 
@@ -524,13 +524,13 @@ msgstr "por Página"
 
 #: admin/tainacan-admin-i18n.php:122
 #, fuzzy
-#| msgid "Field Edition Page"
+#| msgid "Metadatum Edition Page"
 msgid "Metadata on table"
 msgstr "Página de edição de metadado"
 
 # DESCOBRIR O CONTEXTO DESSA “REQUISIÇAO”
 #: admin/tainacan-admin-i18n.php:123
-#: classes/repositories/class-tainacan-fields.php:95
+#: classes/repositories/class-tainacan-metadata.php:95
 msgid "Required"
 msgstr "Requerido"
 
@@ -539,7 +539,7 @@ msgid "Allow multiple values"
 msgstr "Permitir valores múltiplos"
 
 #: admin/tainacan-admin-i18n.php:125
-#: classes/repositories/class-tainacan-fields.php:140
+#: classes/repositories/class-tainacan-metadata.php:140
 msgid "Default value"
 msgstr "Valor padrão"
 
@@ -561,20 +561,20 @@ msgid "Approved"
 msgstr "Aprovado"
 
 #: admin/tainacan-admin-i18n.php:130
-#: classes/field-types/category/class-tainacan-category.php:35
-#: classes/field-types/relationship/class-tainacan-relationship.php:26
+#: classes/metadatum-types/category/class-tainacan-category.php:35
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:26
 msgid "Collection Related"
 msgstr "Coleção relacionada"
 
 #: admin/tainacan-admin-i18n.php:131
-#: classes/field-types/relationship/class-tainacan-relationship.php:30
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:30
 #, fuzzy
-#| msgid "Fields for search"
+#| msgid "Metadata for search"
 msgid "Metadata for search"
 msgstr "Metadados para busca"
 
 #: admin/tainacan-admin-i18n.php:132
-#: classes/field-types/relationship/class-tainacan-relationship.php:34
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:34
 msgid "Allow repeated items"
 msgstr "Permitir itens repetidos"
 
@@ -585,12 +585,12 @@ msgid "Select taxonomy"
 msgstr "Categoria pai"
 
 #: admin/tainacan-admin-i18n.php:134
-#: classes/field-types/category/class-tainacan-category.php:39
+#: classes/metadatum-types/category/class-tainacan-category.php:39
 msgid "Input type"
 msgstr "Tipo de entrada"
 
 #: admin/tainacan-admin-i18n.php:135
-#: classes/field-types/category/class-tainacan-category.php:43
+#: classes/metadatum-types/category/class-tainacan-category.php:43
 msgid "Allow new terms"
 msgstr "Permitir termos novos"
 
@@ -695,7 +695,7 @@ msgstr "Página de capa"
 #: admin/tainacan-admin-i18n.php:159
 #: classes/repositories/class-tainacan-collections.php:118
 #, fuzzy
-#| msgid "Default Displayed Fields"
+#| msgid "Default Displayed Metadata"
 msgid "Default Displayed Metadata"
 msgstr "Metadados exibidos por padrão"
 
@@ -963,13 +963,13 @@ msgstr "Você realmente deseja deletar os itens selecionados?"
 
 #: admin/tainacan-admin-i18n.php:227
 #, fuzzy
-#| msgid "The field Collection related is required"
+#| msgid "The metadatum Collection related is required"
 msgid "The metadata Collection related is required"
 msgstr "O metadado Coleção é requerido"
 
 #: admin/tainacan-admin-i18n.php:228
 #, fuzzy
-#| msgid "No fields found in this collection"
+#| msgid "No metadata found in this collection"
 msgid "No metadata found in this collection"
 msgstr "Nenhum metadado encontrado nesta coleção"
 
@@ -1021,7 +1021,7 @@ msgstr ""
 
 #: admin/tainacan-admin-i18n.php:240
 #, fuzzy
-#| msgid "Are you sure? There are fields not saved, changes will be lost."
+#| msgid "Are you sure? There are metadata not saved, changes will be lost."
 msgid "Are you sure? There are metadata not saved, changes will be lost."
 msgstr ""
 "Opa, tem certeza? Como alguns Metadados não foram salvos, as alterações "
@@ -1039,7 +1039,7 @@ msgstr "Nenhuma descrição fornecida."
 
 #: admin/tainacan-admin-i18n.php:243
 #, fuzzy
-#| msgid "Are you sure? There are fields not saved, changes will be lost."
+#| msgid "Are you sure? There are metadata not saved, changes will be lost."
 msgid "Are you sure? The metadata is not saved, changes will be lost."
 msgstr ""
 "Opa, tem certeza? Como alguns Metadados não foram salvos, as alterações "
@@ -1073,7 +1073,7 @@ msgstr "O que foi atualizado?"
 
 #: admin/tainacan-admin-i18n.php:249
 #, fuzzy
-#| msgid "There is no field here yet."
+#| msgid "There is no metadatum here yet."
 msgid "There is no metadata here yet."
 msgstr "Opa, você ainda não configurou nenhum Metadado"
 
@@ -1176,14 +1176,14 @@ msgstr "Ordenar ascendente ou descendente."
 #: api/class-tainacan-rest-controller.php:419
 #: api/class-tainacan-rest-controller.php:441
 #, fuzzy
-#| msgid "Custom field key."
+#| msgid "Custom metadatum key."
 msgid "Custom metadata key."
 msgstr "Chave de Metadado customizado."
 
 #: api/class-tainacan-rest-controller.php:423
 #: api/class-tainacan-rest-controller.php:427
 #, fuzzy
-#| msgid "Custom field value"
+#| msgid "Custom metadatum value"
 msgid "Custom metadata value"
 msgstr "Valor de Metadado customizado."
 
@@ -1199,7 +1199,7 @@ msgstr ""
 
 #: api/class-tainacan-rest-controller.php:435
 #, fuzzy
-#| msgid "Limit result set to items that have specific custom fields"
+#| msgid "Limit result set to items that have specific custom metadata"
 msgid "Limits result set to items that have specific custom metadata"
 msgstr ""
 "Limita o conjunto de resultados a itens que possuem determinados metadados "
@@ -1254,7 +1254,7 @@ msgstr "OR ou AND, como os sub-arrays deveriam ser comparados."
 #: api/class-tainacan-rest-controller.php:460
 #, fuzzy
 #| msgid ""
-#| "Custom field type. Possible values are NUMERIC, BINARY, CHAR, DATE, "
+#| "Custom metadatum type. Possible values are NUMERIC, BINARY, CHAR, DATE, "
 #| "DATETIME, DECIMAL, SIGNED, TIME, UNSIGNED. Default value is CHAR. You can "
 #| "also specify precision and scale for the DECIMAL and NUMERIC types (for "
 #| "example, DECIMAL(10,5) or NUMERIC(10) are valid). The type DATE works "
@@ -1381,7 +1381,7 @@ msgstr ""
 "'true'. Por padrão, essa ação irá apenas colocar a coleção na lixeira."
 
 #: api/endpoints/class-tainacan-rest-collections-controller.php:235
-#: api/endpoints/class-tainacan-rest-fields-controller.php:241
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:241
 #: api/endpoints/class-tainacan-rest-items-controller.php:294
 #: api/endpoints/class-tainacan-rest-taxonomies-controller.php:286
 msgid "Body can not be empty."
@@ -1389,9 +1389,9 @@ msgstr "O corpo da mensagem não pode estar vazio."
 
 #: api/endpoints/class-tainacan-rest-collections-controller.php:255
 #: api/endpoints/class-tainacan-rest-collections-controller.php:361
-#: api/endpoints/class-tainacan-rest-fields-controller.php:212
-#: api/endpoints/class-tainacan-rest-fields-controller.php:232
-#: api/endpoints/class-tainacan-rest-fields-controller.php:428
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:212
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:232
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:428
 #: api/endpoints/class-tainacan-rest-items-controller.php:313
 #: api/endpoints/class-tainacan-rest-items-controller.php:400
 #: api/endpoints/class-tainacan-rest-taxonomies-controller.php:279
@@ -1407,7 +1407,7 @@ msgid "Collection with this ID was not found"
 msgstr "A coleção com esta ID não foi encontrada"
 
 #: api/endpoints/class-tainacan-rest-collections-controller.php:374
-#: api/endpoints/class-tainacan-rest-fields-controller.php:441
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:441
 #: api/endpoints/class-tainacan-rest-filters-controller.php:183
 #: api/endpoints/class-tainacan-rest-filters-controller.php:289
 #: api/endpoints/class-tainacan-rest-items-controller.php:413
@@ -1433,40 +1433,40 @@ msgstr ""
 msgid "Limits the result set to collections with a specific name"
 msgstr "Limita o conjunto de resultados a coleções com um nome específico"
 
-#: api/endpoints/class-tainacan-rest-field-types-controller.php:26
+#: api/endpoints/class-tainacan-rest-metadatum-types-controller.php:26
 #: api/endpoints/class-tainacan-rest-filter-types-controller.php:26
 #, fuzzy
 msgid "The structure of objects returned."
 msgstr "Retorna a estrutura dos objetos"
 
-#: api/endpoints/class-tainacan-rest-fields-controller.php:396
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:396
 #, fuzzy
-#| msgid "Field with that ID not found"
+#| msgid "Metadatum with that ID not found"
 msgid "Metadata with this ID was not found"
 msgstr "O metadado com esta ID não foi localizado"
 
-#: api/endpoints/class-tainacan-rest-fields-controller.php:402
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:402
 #, fuzzy
 #| msgid "That metadata is not a default metadata"
 msgid "This metadata is not a default metadata"
 msgstr "Este metadado não é um metadado padrão"
 
-#: api/endpoints/class-tainacan-rest-fields-controller.php:409
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:409
 #, fuzzy
-#| msgid "That field is not a collection field"
+#| msgid "That metadatum is not a collection metadatum"
 msgid "This metadata is not a collection metadata"
 msgstr "Este metadado não é um metadado de coleção"
 
-#: api/endpoints/class-tainacan-rest-fields-controller.php:476
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:476
 #, fuzzy
-#| msgid "Limit result set to field with specific name."
+#| msgid "Limit result set to metadatum with specific name."
 msgid "Limits the result set to metadata with a specific name"
 msgstr "Limita o conjunto de resultados a metadados com um nome específico"
 
-#: api/endpoints/class-tainacan-rest-fields-controller.php:496
+#: api/endpoints/class-tainacan-rest-metadata-controller.php:496
 #, fuzzy
 #| msgid ""
-#| "Fetch all values of a field from a collection in all it collection items"
+#| "Fetch all values of a metadatum from a collection in all it collection items"
 msgid "Fetch all content of a metadata within a collection"
 msgstr ""
 "Busca todos os conteúdos do metadado de uma coleção em todos os itens da "
@@ -1496,7 +1496,7 @@ msgstr "Limita o conjunto de resultados a filtros com um nome específico"
 
 #: api/endpoints/class-tainacan-rest-item-metadata-controller.php:216
 #, fuzzy
-#| msgid "Field do not accept suggestion."
+#| msgid "Metadatum do not accept suggestion."
 msgid "The metadata does not accept suggestions"
 msgstr "Esse metadado não aceita sugestões"
 
@@ -1588,10 +1588,10 @@ msgstr "Editor Tainacan"
 msgid " is invalid"
 msgstr "é inválida"
 
-#: classes/entities/class-tainacan-field.php:417
+#: classes/entities/class-tainacan-metadatum.php:417
 #, fuzzy
 #| msgid ""
-#| "Compound fields do not support fields with multiple values (except "
+#| "Compound metadata do not support metadata with multiple values (except "
 #| "categories)"
 msgid ""
 "Compound metadata do not support metadata with multiple values (except "
@@ -1600,8 +1600,8 @@ msgstr ""
 "Metadados compostos não suportam metadados com vários valores (exceto "
 "categorias)"
 
-#: classes/entities/class-tainacan-field.php:426
-#: classes/entities/class-tainacan-field.php:441
+#: classes/entities/class-tainacan-metadatum.php:426
+#: classes/entities/class-tainacan-metadatum.php:441
 #, fuzzy
 #| msgid ""
 #| "Category metadata can not be used inside Compound metadata with multiple "
@@ -1649,26 +1649,26 @@ msgstr "Novo termo de gênero"
 msgid "You can not have two terms with the same name at the same level"
 msgstr "Você não pode ter dois termos com o mesmo nome em um mesmo nível"
 
-#: classes/field-types/category/class-tainacan-category.php:36
-#: classes/field-types/relationship/class-tainacan-relationship.php:27
+#: classes/metadatum-types/category/class-tainacan-category.php:36
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:27
 msgid "Select the collection to fetch items"
 msgstr "Selecione a coleção para buscar itens"
 
-#: classes/field-types/category/class-tainacan-category.php:40
+#: classes/metadatum-types/category/class-tainacan-category.php:40
 msgid "The html type of the terms list "
 msgstr "O tipo de html utilizado na lista de termos"
 
-#: classes/field-types/category/class-tainacan-category.php:44
+#: classes/metadatum-types/category/class-tainacan-category.php:44
 msgid "Allows to create new terms"
 msgstr "Permite a criação de novos termos"
 
-#: classes/field-types/category/class-tainacan-category.php:70
+#: classes/metadatum-types/category/class-tainacan-category.php:70
 #, fuzzy
 #| msgid "Please select a category"
 msgid "Please select a taxonomy"
 msgstr "Por favor, selecione uma taxonomia."
 
-#: classes/field-types/category/class-tainacan-category.php:88
+#: classes/metadatum-types/category/class-tainacan-category.php:88
 #, fuzzy
 #| msgid ""
 #| "You can not have 2 taxonomy metadata using the same taxonomy in a "
@@ -1679,18 +1679,18 @@ msgstr ""
 "Você não pode ter 2 metadados de taxonomia utilizando a mesma taxonomia em "
 "uma coleção."
 
-#: classes/field-types/core-description/class-tainacan-core-description.php:71
-#: classes/field-types/core-title/class-tainacan-core-title.php:72
+#: classes/metadatum-types/core-description/class-tainacan-core-description.php:71
+#: classes/metadatum-types/core-title/class-tainacan-core-title.php:72
 msgid "Core Metadata can not accept multiple values"
 msgstr "Metadados fixos (Core) não podem aceitar valores múltiplos"
 
-#: classes/field-types/relationship/class-tainacan-relationship.php:31
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:31
 #, fuzzy
-#| msgid "Select the fields to help the search"
+#| msgid "Select the metadata to help the search"
 msgid "Select the metadata to help the search"
 msgstr "Selecione os metadados que irão auxiliar na busca"
 
-#: classes/field-types/relationship/class-tainacan-relationship.php:35
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:35
 #, fuzzy
 #| msgid "Allow different items with the same item selected"
 msgid ""
@@ -1700,23 +1700,23 @@ msgstr ""
 "Permite que itens diferentes sejam relacionados ao um mesmo item selecionado "
 "de outra coleção"
 
-#: classes/field-types/relationship/class-tainacan-relationship.php:60
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:60
 #, fuzzy
 #| msgid "The collection ID"
 msgid "Invalid collection ID"
 msgstr "O ID da coleção"
 
-#: classes/field-types/relationship/class-tainacan-relationship.php:64
+#: classes/metadatum-types/relationship/class-tainacan-relationship.php:64
 #, fuzzy
-#| msgid "The field Collection related is required"
+#| msgid "The metadatum Collection related is required"
 msgid "The related collection is required"
 msgstr "O metadado Coleção é requerido"
 
-#: classes/field-types/selectbox/class-tainacan-selectbox.php:26
+#: classes/metadatum-types/selectbox/class-tainacan-selectbox.php:26
 msgid "Options"
 msgstr "Opções"
 
-#: classes/field-types/selectbox/class-tainacan-selectbox.php:27
+#: classes/metadatum-types/selectbox/class-tainacan-selectbox.php:27
 #, fuzzy
 #| msgid "Create the options for the select, hit enter to add new one"
 msgid "Creates options for what is selected. Hit <enter> to add a new one."
@@ -1725,7 +1725,7 @@ msgstr ""
 "uma nova opção."
 
 # DESCOBRIR O CONTEXTO DESSA “REQUISIÇAO”
-#: classes/field-types/selectbox/class-tainacan-selectbox.php:56
+#: classes/metadatum-types/selectbox/class-tainacan-selectbox.php:56
 #, fuzzy
 #| msgid "Required"
 msgid "Required options"
@@ -1733,7 +1733,7 @@ msgstr "Requerido"
 
 #: classes/filter-types/filter-type/class-tainacan-filter-type.php:92
 #, fuzzy
-#| msgid "The field primitive type is not supported by this filter"
+#| msgid "The metadatum primitive type is not supported by this filter"
 msgid "The metadata primitive type is not supported by this filter"
 msgstr "O tipo primitivo do metadado não é suportado por este filtro"
 
@@ -1772,7 +1772,7 @@ msgid "The collection modification date"
 msgstr "Data de modificação da coleção"
 
 #: classes/repositories/class-tainacan-collections.php:73
-#: classes/repositories/class-tainacan-fields.php:61
+#: classes/repositories/class-tainacan-metadata.php:61
 #: classes/repositories/class-tainacan-filters.php:39
 msgid "Order"
 msgstr "Ordem"
@@ -1780,7 +1780,7 @@ msgstr "Ordem"
 # COMO ASSIM?
 #: classes/repositories/class-tainacan-collections.php:75
 #, fuzzy
-#| msgid "Collection order. Field used if collections are manually ordered."
+#| msgid "Collection order. Metadatum used if collections are manually ordered."
 msgid ""
 "Collection order. This metadata is used if collections are manually ordered."
 msgstr ""
@@ -1811,7 +1811,7 @@ msgstr ""
 
 #: classes/repositories/class-tainacan-collections.php:102
 #, fuzzy
-#| msgid "Default Displayed Fields"
+#| msgid "Default Displayed Metadata"
 msgid "Default Order metadata"
 msgstr "Metadados exibidos por padrão"
 
@@ -1845,13 +1845,13 @@ msgstr "Modo de visualização padrão da coleção"
 
 #: classes/repositories/class-tainacan-collections.php:134
 #, fuzzy
-#| msgid "Ordination fields"
+#| msgid "Ordination metadata"
 msgid "Ordination metadata"
 msgstr "Metadados de ordenação"
 
 #: classes/repositories/class-tainacan-collections.php:137
 #, fuzzy
-#| msgid "Collection fields ordination"
+#| msgid "Collection metadata ordination"
 msgid "Collection metadata ordination"
 msgstr "Ordenação dos metadados de coleção"
 
@@ -1906,7 +1906,7 @@ msgstr ""
 "organização dos arquivos"
 
 #: classes/repositories/class-tainacan-collections.php:201
-#: classes/repositories/class-tainacan-fields.php:196
+#: classes/repositories/class-tainacan-metadata.php:196
 #: classes/repositories/class-tainacan-filters.php:99
 #: classes/repositories/class-tainacan-items.php:123
 #: classes/repositories/class-tainacan-items.php:124
@@ -1944,26 +1944,26 @@ msgstr "Nenhuma coleção encontrada na lixeira"
 msgid "Parent Collection:"
 msgstr "Coleção raiz"
 
-#: classes/repositories/class-tainacan-fields.php:48
+#: classes/repositories/class-tainacan-metadata.php:48
 #, fuzzy
-#| msgid "Name of the field"
+#| msgid "Name of the metadatum"
 msgid "Name of the metadata"
 msgstr "Nome do Metadado"
 
-#: classes/repositories/class-tainacan-fields.php:49
+#: classes/repositories/class-tainacan-metadata.php:49
 msgid "The name should be a text value and not empty"
 msgstr "O nome  deve ser um texto não vazio"
 
-#: classes/repositories/class-tainacan-fields.php:56
+#: classes/repositories/class-tainacan-metadata.php:56
 #, fuzzy
-#| msgid "A unique and santized string representation of the field"
+#| msgid "A unique and santized string representation of the metadatum"
 msgid "A unique and santized string representation of the metadata"
 msgstr "Um texto único e sanitizado representando o metadado"
 
 # COMO ASSIM?
-#: classes/repositories/class-tainacan-fields.php:63
+#: classes/repositories/class-tainacan-metadata.php:63
 #, fuzzy
-#| msgid "Field order. Field used if collections are manually ordered"
+#| msgid "Metadatum order. Metadatum used if collections are manually ordered"
 msgid ""
 "Metadata order. This metadata will be used if collections were manually "
 "ordered."
@@ -1971,148 +1971,148 @@ msgstr ""
 "Ordem do Metadado. Esse metadado será utilizado se as coleções forem "
 "ordenadas manualmente."
 
-#: classes/repositories/class-tainacan-fields.php:64
+#: classes/repositories/class-tainacan-metadata.php:64
 msgid "The menu order should be a numeric value"
 msgstr "A ordem do menu deve ser um valor numérico"
 
-#: classes/repositories/class-tainacan-fields.php:69
+#: classes/repositories/class-tainacan-metadata.php:69
 #: classes/repositories/class-tainacan-logs.php:63
 #: classes/repositories/class-tainacan-terms.php:49
 msgid "Parent"
 msgstr "Raiz"
 
-#: classes/repositories/class-tainacan-fields.php:71
+#: classes/repositories/class-tainacan-metadata.php:71
 msgid "Parent metadata"
 msgstr "Metadado raiz"
 
-#: classes/repositories/class-tainacan-fields.php:80
+#: classes/repositories/class-tainacan-metadata.php:80
 #, fuzzy
-#| msgid "The field description"
+#| msgid "The metadatum description"
 msgid "The metadata description"
 msgstr "Descrição do Metadado"
 
-#: classes/repositories/class-tainacan-fields.php:87
+#: classes/repositories/class-tainacan-metadata.php:87
 #: classes/repositories/class-tainacan-filters.php:62
 msgid "Type"
 msgstr "Tipo"
 
-#: classes/repositories/class-tainacan-fields.php:89
+#: classes/repositories/class-tainacan-metadata.php:89
 #, fuzzy
-#| msgid "The field type"
+#| msgid "The metadatum type"
 msgid "The metadata type"
 msgstr "O tipo de Metadado"
 
-#: classes/repositories/class-tainacan-fields.php:90
+#: classes/repositories/class-tainacan-metadata.php:90
 #, fuzzy
-#| msgid "Field type is empty"
+#| msgid "Metadatum type is empty"
 msgid "Metadata type is empty"
 msgstr "Tipo de metadado está vazio"
 
-#: classes/repositories/class-tainacan-fields.php:97
+#: classes/repositories/class-tainacan-metadata.php:97
 #, fuzzy
-#| msgid "The field is required"
+#| msgid "The metadatum is required"
 msgid "The metadata is required"
 msgstr "O metadado é requerido"
 
-#: classes/repositories/class-tainacan-fields.php:98
+#: classes/repositories/class-tainacan-metadata.php:98
 msgid "The metadata content is invalid"
 msgstr "O conteúdo do metadado é inválido"
 
-#: classes/repositories/class-tainacan-fields.php:104
+#: classes/repositories/class-tainacan-metadata.php:104
 msgid "Collection key"
 msgstr "Chave da coleção"
 
-#: classes/repositories/class-tainacan-fields.php:106
+#: classes/repositories/class-tainacan-metadata.php:106
 #, fuzzy
-#| msgid "Field value should not be repeated"
+#| msgid "Metadatum value should not be repeated"
 msgid "Metadata value should not be repeated"
 msgstr "Valores do metadado não devem ser repetidos"
 
-#: classes/repositories/class-tainacan-fields.php:107
+#: classes/repositories/class-tainacan-metadata.php:107
 msgid "Collection key is invalid"
 msgstr "Chave da coleção é invalida"
 
-#: classes/repositories/class-tainacan-fields.php:113
+#: classes/repositories/class-tainacan-metadata.php:113
 msgid "Multiple"
 msgstr "Múltiplo"
 
-#: classes/repositories/class-tainacan-fields.php:115
+#: classes/repositories/class-tainacan-metadata.php:115
 msgid "Allow multiple values for the metadata"
 msgstr "Permite várias entradas de conteúdo no metadado"
 
-#: classes/repositories/class-tainacan-fields.php:116
+#: classes/repositories/class-tainacan-metadata.php:116
 #, fuzzy
 #| msgid "Metadata"
 msgid "Invalid multiple metadata"
 msgstr "Metadado"
 
-#: classes/repositories/class-tainacan-fields.php:123
+#: classes/repositories/class-tainacan-metadata.php:123
 msgid "Cardinality"
 msgstr "Cardinalidade"
 
-#: classes/repositories/class-tainacan-fields.php:125
+#: classes/repositories/class-tainacan-metadata.php:125
 #, fuzzy
-#| msgid "Number of multiples possible fields"
+#| msgid "Number of multiples possible metadata"
 msgid "Number of multiples possible metadata"
 msgstr "Número de metadados múltiplos possíveis"
 
-#: classes/repositories/class-tainacan-fields.php:126
+#: classes/repositories/class-tainacan-metadata.php:126
 msgid "This number of multiples metadata is not allowed"
 msgstr "Este número de múltiplos metadados não é permitido"
 
-#: classes/repositories/class-tainacan-fields.php:132
+#: classes/repositories/class-tainacan-metadata.php:132
 msgid "Mask"
 msgstr "Máscara"
 
-#: classes/repositories/class-tainacan-fields.php:134
+#: classes/repositories/class-tainacan-metadata.php:134
 #, fuzzy
-#| msgid "The mask to be used in the field"
+#| msgid "The mask to be used in the metadatum"
 msgid "The mask to be used in the metadata"
 msgstr "A máscara que deve ser utilizada no metadado"
 
-#: classes/repositories/class-tainacan-fields.php:142
+#: classes/repositories/class-tainacan-metadata.php:142
 #, fuzzy
-#| msgid "The value default fot the field"
+#| msgid "The value default fot the metadatum"
 msgid "The default value for the metadata"
 msgstr "O conteúdo padrão para o campo"
 
-#: classes/repositories/class-tainacan-fields.php:146
+#: classes/repositories/class-tainacan-metadata.php:146
 #, fuzzy
-#| msgid "Field Type options"
+#| msgid "Metadatum Type options"
 msgid "Metadata type options"
 msgstr "Opções de tipo de metadado"
 
-#: classes/repositories/class-tainacan-fields.php:149
+#: classes/repositories/class-tainacan-metadata.php:149
 #, fuzzy
-#| msgid "Options specific for field type"
+#| msgid "Options specific for metadatum type"
 msgid "Specific options for metadata type"
 msgstr "Opções específicas do tipo de metadado"
 
-#: classes/repositories/class-tainacan-fields.php:156
+#: classes/repositories/class-tainacan-metadata.php:156
 #: classes/repositories/class-tainacan-filters.php:71
 #: classes/repositories/class-tainacan-items.php:60
 msgid "The collection ID"
 msgstr "O ID da coleção"
 
-#: classes/repositories/class-tainacan-fields.php:161
+#: classes/repositories/class-tainacan-metadata.php:161
 #, fuzzy
-#| msgid "Field Value Accepts Suggestions"
+#| msgid "Metadatum Value Accepts Suggestions"
 msgid "Metadata Value Accepts Suggestions"
 msgstr "O conteúdo do metadado aceita sugestões"
 
-#: classes/repositories/class-tainacan-fields.php:163
+#: classes/repositories/class-tainacan-metadata.php:163
 #, fuzzy
-#| msgid "Allow communities to suggest different values for the field"
+#| msgid "Allow communities to suggest different values for the metadatum"
 msgid "Allow community to suggest different values for the metadata"
 msgstr "Permite que a comunidade sugira valores diferentes para este campo"
 
-#: classes/repositories/class-tainacan-fields.php:169
+#: classes/repositories/class-tainacan-metadata.php:169
 #, fuzzy
 #| msgid "Metadata"
 msgid "Relationship metadata mapping"
 msgstr "Metadado"
 
-#: classes/repositories/class-tainacan-fields.php:172
+#: classes/repositories/class-tainacan-metadata.php:172
 #, fuzzy
 #| msgid ""
 #| "The metadata mapping options. Metadata can be configured to match another "
@@ -2124,57 +2124,57 @@ msgstr ""
 "Opções de mapeamento dos metadados. Aqui os metadados podem ser configurados "
 "para corresponder a outro tipo de distribuição de dados."
 
-#: classes/repositories/class-tainacan-fields.php:173
+#: classes/repositories/class-tainacan-metadata.php:173
 msgid "Invalid Metadata Mapping"
 msgstr "Metadado de mapeamento inválido"
 
-#: classes/repositories/class-tainacan-fields.php:179
+#: classes/repositories/class-tainacan-metadata.php:179
 msgid "Display"
 msgstr "Exposição"
 
-#: classes/repositories/class-tainacan-fields.php:180
+#: classes/repositories/class-tainacan-metadata.php:180
 msgid "string"
 msgstr "string"
 
-#: classes/repositories/class-tainacan-fields.php:182
+#: classes/repositories/class-tainacan-metadata.php:182
 #, fuzzy
 #| msgid "Display by default on listing or not display or never display."
 msgid "Display by default on listing or do not display or never display."
 msgstr "Expõe por padrão quando listado ou não exibe ou nunca exibe."
 
-#: classes/repositories/class-tainacan-fields.php:197
+#: classes/repositories/class-tainacan-metadata.php:197
 msgid "Add new Metadata"
 msgstr "Adiciona novo metadado"
 
-#: classes/repositories/class-tainacan-fields.php:198
+#: classes/repositories/class-tainacan-metadata.php:198
 msgid "Edit Metadata"
 msgstr "Editar metadado"
 
-#: classes/repositories/class-tainacan-fields.php:199
+#: classes/repositories/class-tainacan-metadata.php:199
 msgid "New Metadata"
 msgstr "Novo metadado"
 
-#: classes/repositories/class-tainacan-fields.php:200
+#: classes/repositories/class-tainacan-metadata.php:200
 msgid "View Metadata"
 msgstr "Exibir metadado"
 
-#: classes/repositories/class-tainacan-fields.php:201
+#: classes/repositories/class-tainacan-metadata.php:201
 msgid "Search Metadata"
 msgstr "Buscar metadado"
 
-#: classes/repositories/class-tainacan-fields.php:202
+#: classes/repositories/class-tainacan-metadata.php:202
 msgid "No Metadata found "
 msgstr "Nenhum metadado encontrado"
 
-#: classes/repositories/class-tainacan-fields.php:203
+#: classes/repositories/class-tainacan-metadata.php:203
 #, fuzzy
-#| msgid "No Field found in trash"
+#| msgid "No Metadatum found in trash"
 msgid "No Metadata found in trash"
 msgstr "Nenhum campo encontrado na lixeira"
 
-#: classes/repositories/class-tainacan-fields.php:204
+#: classes/repositories/class-tainacan-metadata.php:204
 #, fuzzy
-#| msgid "Parent Field:"
+#| msgid "Parent Metadatum:"
 msgid "Parent Metadata:"
 msgstr "Metadado Pai:"
 
@@ -2188,7 +2188,7 @@ msgstr "O nome do Filtro deve ser um texto não vazio"
 
 #: classes/repositories/class-tainacan-filters.php:41
 #, fuzzy
-#| msgid "Filter order. Field used if filters are manually ordered"
+#| msgid "Filter order. Metadatum used if filters are manually ordered"
 msgid "Filter order. This metadata is used if filters were manually ordered."
 msgstr ""
 "Ordem do Filtro. Este metadado é utilizado se os filtros forem ordenados "
@@ -2688,44 +2688,44 @@ msgstr "Coleções: %s"
 #~ msgid "Limit result set to term with specific name."
 #~ msgstr "Limita o conjunto de resultados a termos com um determinado nome"
 
-#~ msgid "Field"
+#~ msgid "Metadatum"
 #~ msgstr "Metadado"
 
-#~ msgid "Filter field"
+#~ msgid "Filter metadatum"
 #~ msgstr "Metadado do Filtro"
 
 #~| msgid "The filter type options"
-#~ msgid "The field mapping options"
-#~ msgstr "The field mapping options"
+#~ msgid "The metadatum mapping options"
+#~ msgstr "The metadatum mapping options"
 
 #, fuzzy
-#~| msgid "Field required field is invalid"
-#~ msgid "Metadata required field is invalid"
+#~| msgid "Metadatum required metadatum is invalid"
+#~ msgid "Metadata required metadatum is invalid"
 #~ msgstr "Metadado requerido é invalido"
 
-#~ msgid "Parent field"
+#~ msgid "Parent metadatum"
 #~ msgstr "Metadado pai"
 
-#~ msgid "Fields on table"
+#~ msgid "Metadata on table"
 #~ msgstr "Metadados na tabela"
 
-#~ msgid "Default Displayed Fields"
+#~ msgid "Default Displayed Metadata"
 #~ msgstr "Metadados exibidos por padrão"
 
-#~ msgid "Edit Fields of"
+#~ msgid "Edit Metadata of"
 #~ msgstr "Editar metadados de"
 
-#~ msgid "Active Fields"
+#~ msgid "Active Metadata"
 #~ msgstr "Metadados ativos"
 
-#~ msgid "Available Fields"
+#~ msgid "Available Metadata"
 #~ msgstr "Metadados disponíveis"
 
-#~ msgid "Field Page"
+#~ msgid "Metadatum Page"
 #~ msgstr "Página do Metadado"
 
-#~ msgid "Collection Fields"
-#~ msgstr "Collection Fields"
+#~ msgid "Collection Metadata"
+#~ msgstr "Collection Metadata"
 
 #, fuzzy
 #~| msgid "Metadata"
@@ -2738,19 +2738,19 @@ msgstr "Coleções: %s"
 #~ msgid "One or more attributes are invalid"
 #~ msgstr "Verifique, atributo(s) inválido(s)"
 
-#~ msgid "Fields"
+#~ msgid "Metadata"
 #~ msgstr "Metadados"
 
-#~ msgid "Edit Field"
+#~ msgid "Edit Metadatum"
 #~ msgstr "Editar Campo"
 
-#~ msgid "New Field"
+#~ msgid "New Metadatum"
 #~ msgstr "Novo campo"
 
-#~ msgid "View Field"
+#~ msgid "View Metadatum"
 #~ msgstr "Ver Campo"
 
-#~ msgid "Search Field"
+#~ msgid "Search Metadatum"
 #~ msgstr "Buscar Campo"
 
 #~ msgid "See"
@@ -2776,31 +2776,31 @@ msgstr "Coleções: %s"
 #~ msgid "Item Edition Page"
 #~ msgstr "Página de Edição do Item"
 
-#~ msgid "Collection Fields Edition Page"
+#~ msgid "Collection Metadata Edition Page"
 #~ msgstr "Página de Edição dos Metadados da Coleção"
 
-#~ msgid "Drag and drop Fields here to Collection."
+#~ msgid "Drag and drop Metadata here to Collection."
 #~ msgstr "Arraste e solte Metadados aqui para a Coleção."
 
-#~ msgid "Drag and drop Fields to create Filters on Collection."
+#~ msgid "Drag and drop Metadata to create Filters on Collection."
 #~ msgstr "Arraste e solte Metadados para criar Filtros na Coleção."
 
-#~ msgid "Drag and drop Fields here to Repository."
+#~ msgid "Drag and drop Metadata here to Repository."
 #~ msgstr "Araste e solte Metadados aqui para adicionar ao Repositório."
 
-#~ msgid "Drag and drop Fields to create Filters on Repository."
+#~ msgid "Drag and drop Metadata to create Filters on Repository."
 #~ msgstr "Arraste e solte Metadados para criar Filtros no Repositório."
 
 #~ msgid "Privacy"
 #~ msgstr "Privacidade"
 
-#~ msgid "The field should be omitted in item view"
+#~ msgid "The metadatum should be omitted in item view"
 #~ msgstr "O campo deve ser omitido na visualização do item"
 
 #~ msgid "Privacy is invalid"
 #~ msgstr "Privacidade invalida"
 
-#~ msgid "The field can be deleted"
+#~ msgid "The metadatum can be deleted"
 #~ msgstr "O campo pode ser deletado"
 
 #~ msgid "Can delete is invalid"
diff --git a/src/migrate-post-type.php b/src/migrate-post-type.php
new file mode 100644
index 000000000..92e04f90b
--- /dev/null
+++ b/src/migrate-post-type.php
@@ -0,0 +1,89 @@
+<?php
+
+function tainacan_migrate_post_type_field_to_metadatum(){
+    global $wpdb;
+
+    $wpdb->update($wpdb->posts,
+        ['post_type' => 'tainacan-metadatum'],
+        ['post_type' => 'tainacan-field'],
+        '%s', '%s');
+      
+    $wpdb->update($wpdb->postmeta,
+        ['meta_key' => 'default_displayed_metadata'],
+        ['meta_key' => 'default_displayed_fields'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_key' => 'metadata_order'],
+        ['meta_key' => 'fields_order'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_key' => 'metadatum'],
+        ['meta_key' => 'field'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_key' => 'metadatum_type'],
+        ['meta_key' => 'field_type'],
+        '%s', '%s');
+    
+    $wpdb->update($wpdb->postmeta,
+        ['meta_key' => 'metadatum_type_options'],
+        ['meta_key' => 'field_type_options'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Core_Description'],
+        ['meta_value' => 'Tainacan\Field_Types\Core_Description'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Core_Title'],
+        ['meta_value' => 'Tainacan\Field_Types\Core_Title'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Text'],
+        ['meta_value' => 'Tainacan\Field_Types\Text'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Textarea'],
+        ['meta_value' => 'Tainacan\Field_Types\Textarea'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Date'],
+        ['meta_value' => 'Tainacan\Field_Types\Date'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Numeric'],
+        ['meta_value' => 'Tainacan\Field_Types\Numeric'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Selectbox'],
+        ['meta_value' => 'Tainacan\Field_Types\Selectbox'],
+        '%s', '%s');
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Relationship'],
+        ['meta_value' => 'Tainacan\Field_Types\Relationship'],
+        '%s', '%s');
+
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Category'],
+        ['meta_value' => 'Tainacan\Field_Types\Category'],
+        '%s', '%s');
+
+
+    $wpdb->update($wpdb->postmeta,
+        ['meta_value' => 'Tainacan\Metadatum_Types\Compound'],
+        ['meta_value' => 'Tainacan\Field_Types\Compound'],
+        '%s', '%s');
+}
+
+?>
\ No newline at end of file
diff --git a/src/readme.txt b/src/readme.txt
index 73df89808..fe2075530 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -25,7 +25,7 @@ Faceted Search. Browse your collection (and let the public browse it) using a fa
 
 * "Themes": Tainacan has its own default theme, that helps you present your collections in a beautiful and effective way, but will also work with any WordPress theme. For developers, it will be easy to add tainacan specific features to an existing theme.
 
-* "API and Interoperability": Tainacan implements a RESTful API (read and write) to allow other applications to interact with your repository. Expose you collection in different formats, such as Json, JsonLD, OAI-PMH and others. If your collection have a specific set of metadata, you can map your fields to match the standards you want to use.
+* "API and Interoperability": Tainacan implements a RESTful API (read and write) to allow other applications to interact with your repository. Expose you collection in different formats, such as Json, JsonLD, OAI-PMH and others. If your collection have a specific set of metadata, you can map your metadata to match the standards you want to use.
 
 == Getting Started ==
 
diff --git a/src/tainacan.php b/src/tainacan.php
index 1029c0ace..b6859ccc0 100644
--- a/src/tainacan.php
+++ b/src/tainacan.php
@@ -17,6 +17,7 @@ const TAINACAN_CLASSES_DIR = __DIR__ . '/classes/';
 require_once(TAINACAN_CLASSES_DIR . 'tainacan-creator.php');
 require_once(TAINACAN_API_DIR     . 'tainacan-rest-creator.php');
 require_once('setup-db.php');
+require_once('migrate-post-type.php');
 
 // DEV Interface, used for debugging
 function tnc_enable_dev_wp_interface() {
@@ -37,3 +38,4 @@ add_action( 'plugins_loaded', 'tainacan_load_plugin_textdomain' );
 $Tainacan_Capabilities = \Tainacan\Capabilities::get_instance();
 register_activation_hook( __FILE__, array( $Tainacan_Capabilities, 'init' ) );
 register_activation_hook( __FILE__, 'tainacan_create_bd_process_db' );
+register_activation_hook( __FILE__, 'tainacan_migrate_post_type_field_to_metadatum');
diff --git a/src/theme-helper/table-view-mode.vue b/src/theme-helper/table-view-mode.vue
index 7de8790f0..7634c45d5 100644
--- a/src/theme-helper/table-view-mode.vue
+++ b/src/theme-helper/table-view-mode.vue
@@ -4,17 +4,17 @@
             <table class="tainacan-table">
                 <thead>
                     <tr>
-                        <!-- Displayed Fields -->
+                        <!-- Displayed Metadata -->
                         <th 
-                                v-for="(column, index) in tableFields"
+                                v-for="(column, index) in tableMetadata"
                                 :key="index"
                                 v-if="column.display"
                                 class="column-default-width"
                                 :class="{
-                                        'thumbnail-cell': column.field == 'row_thumbnail', 
-                                        'column-small-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Date' || column.field_type_object.className == 'Tainacan\\Field_Types\\Numeric') : false,
-                                        'column-medium-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Selectbox' || column.field_type_object.className == 'Tainacan\\Field_Types\\Category' || column.field_type_object.className == 'Tainacan\\Field_Types\\Compound') : false,
-                                        'column-large-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Textarea') : false,
+                                        'thumbnail-cell': column.metadatum == 'row_thumbnail', 
+                                        'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false,
+                                        'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false,
+                                        'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false,
                                 }"
                                 :custom-key="column.slug">
                             <div class="th-wrap">{{ column.name }}</div>
@@ -29,26 +29,26 @@
                         <!-- Item Displayed Metadata -->
                         <td 
                                 :key="index"    
-                                v-for="(column, index) in tableFields"
+                                v-for="(column, index) in tableMetadata"
                                 v-if="column.display"
                                 :label="column.name" 
-                                :aria-label="(column.field != 'row_thumbnail' && column.field != 'row_creation' && column.field != 'row_author')
+                                :aria-label="(column.metadatum != 'row_thumbnail' && column.metadatum != 'row_creation' && column.metadatum != 'row_author')
                                              ? column.name + '' + (item.metadata ? item.metadata[column.slug].value_as_string : '') : ''"
                                 class="column-default-width"
                                 :class="{
-                                        'thumbnail-cell': column.field == 'row_thumbnail',
-                                        'column-main-content' : column.field_type_object != undefined ? (column.field_type_object.related_mapped_prop == 'title') : false,
-                                        'column-needed-width column-align-right' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Numeric') : false,
-                                        'column-small-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Date' || column.field_type_object.className == 'Tainacan\\Field_Types\\Numeric') : false,
-                                        'column-medium-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Selectbox' || column.field_type_object.className == 'Tainacan\\Field_Types\\Category' || column.field_type_object.className == 'Tainacan\\Field_Types\\Compound') : false,
-                                        'column-large-width' : column.field_type_object != undefined ? (column.field_type_object.className == 'Tainacan\\Field_Types\\Textarea') : false,
+                                        'thumbnail-cell': column.metadatum == 'row_thumbnail',
+                                        'column-main-content' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.related_mapped_prop == 'title') : false,
+                                        'column-needed-width column-align-right' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false,
+                                        'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false,
+                                        'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false,
+                                        'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false,
                                 }"
                                 @click="goToItemPage(item)">
 
                             <!-- <data-and-tooltip
-                                    v-if="column.field !== 'row_thumbnail' &&
-                                            column.field !== 'row_actions' &&
-                                            column.field !== 'row_creation'"
+                                    v-if="column.metadatum !== 'row_thumbnail' &&
+                                            column.metadatum !== 'row_actions' &&
+                                            column.metadatum !== 'row_creation'"
                                     :data="renderMetadata( item.metadata[column.slug] )"/> -->
                             <p
                                     v-tooltip="{
@@ -58,13 +58,13 @@
                                         placement: 'auto-start'
                                     }"
                                     v-if="item.metadata != undefined &&
-                                          column.field !== 'row_thumbnail' &&
-                                          column.field !== 'row_actions' &&
-                                          column.field !== 'row_creation' &&
-                                          column.field !== 'row_author'"
+                                          column.metadatum !== 'row_thumbnail' &&
+                                          column.metadatum !== 'row_actions' &&
+                                          column.metadatum !== 'row_creation' &&
+                                          column.metadatum !== 'row_author'"
                                     v-html="renderMetadata( item.metadata[column.slug] )"/>
 
-                            <span v-if="column.field == 'row_thumbnail'">
+                            <span v-if="column.metadatum == 'row_thumbnail'">
                                 <img 
                                         class="table-thumb" 
                                         :src="item[column.slug].thumb">
@@ -76,7 +76,7 @@
                                         autoHide: false,
                                         placement: 'auto-start'
                                     }"
-                                    v-if="column.field == 'row_author' || column.field == 'row_creation'">
+                                    v-if="column.metadatum == 'row_author' || column.metadatum == 'row_creation'">
                                     {{ item[column.slug] }}
                             </p>
 
@@ -94,7 +94,7 @@ export default {
     name: 'TableViewMode',
     props: {
         collectionId: Number,
-        tableFields: Array,
+        tableMetadata: Array,
         items: Array,
         isLoading: false
     },
diff --git a/src/theme-helper/template-tags.php b/src/theme-helper/template-tags.php
index 86392d5e4..bc2508d3f 100644
--- a/src/theme-helper/template-tags.php
+++ b/src/theme-helper/template-tags.php
@@ -8,15 +8,15 @@ use \Tainacan\Repositories;
  * 
  * Return the item metadata as a HTML string to be used as output.
  *
- * Each metadata is a label with the field name and the value.
+ * Each metadata is a label with the metadatum name and the value.
  *
- * If an ID, a slug or a Tainacan\Entities\Field object is passed in 'metadata' parameter, it returns only one metadata, otherwise
+ * If an ID, a slug or a Tainacan\Entities\Metadatum object is passed in 'metadata' parameter, it returns only one metadata, otherwise
  * it returns all metadata
  * 
  * @param array|string $args {
 	 *     Optional. Array or string of arguments.
 	 * 
-	 * 	   @type mixed		 $metadata					Field object, ID or slug to retrieve only one field. empty returns all metadata
+	 * 	   @type mixed		 $metadata					Metadatum object, ID or slug to retrieve only one metadatum. empty returns all metadata
 	 * 
 	 *     @type array		 $metadata__in				Array of metadata IDs or Slugs to be retrieved. Default none
 	 * 
@@ -28,7 +28,7 @@ use \Tainacan\Repositories;
 	 * 
 	 *     @type bool		 $exclude_core				Exclude Core Metadata (title and description) from result. Default false
 	 * 
-	 *     @type bool        $hide_empty                Wether to hide or not fields the item has no value to
+	 *     @type bool        $hide_empty                Wether to hide or not metadata the item has no value to
 	 *                                                  Default: true
 	 *     @type string      $before_title              String to be added before each metadata title
 	 *                                                  Default '<h3>'
@@ -53,8 +53,8 @@ function tainacan_get_the_metadata($args = array()) {
 	
 }
 
-function tainacan_the_metadata($field = null, $args = array()) {
-	echo tainacan_get_the_metadata($field, $args);
+function tainacan_the_metadata($metadatum = null, $args = array()) {
+	echo tainacan_get_the_metadata($metadatum, $args);
 }
 
 /**
@@ -62,8 +62,8 @@ function tainacan_the_metadata($field = null, $args = array()) {
  * 
  * Return the item document as a HTML string to be used as output.
  *
- * @param  int|string|Tainacan\Entities\Field $field Field object, ID or slug to retrieve only one field. empty returns all fields
- * @param bool $hide_empty Wether to hide or not fields the item has no value to
+ * @param  int|string|Tainacan\Entities\Metadatum $metadatum Metadatum object, ID or slug to retrieve only one metadatum. empty returns all metadata
+ * @param bool $hide_empty Wether to hide or not metadata the item has no value to
  * @return string        The HTML output
  */
 function tainacan_get_the_document() {
@@ -232,19 +232,19 @@ function tainacan_get_item($post_id = 0) {
  * @return bool
  */
 function tainacan_current_view_displays($property) {
-	global $view_mode_displayed_fields;
+	global $view_mode_displayed_metadata;
 
-	// Core fields appear in fetch_only as metadata
+	// Core metadata appear in fetch_only as metadata
 	if ($property == 'title' || $property == 'description') {
 		$item = tainacan_get_item();
-		$core_getter_method = "get_core_{$property}_field";
+		$core_getter_method = "get_core_{$property}_metadatum";
         $property = $item->get_collection()->$core_getter_method()->get_id();
 	}
 
 	if (is_string($property)) {
-		return in_array($property, $view_mode_displayed_fields);
+		return in_array($property, $view_mode_displayed_metadata);
 	} elseif (is_integer($property)) {
-		return in_array($property, $view_mode_displayed_fields['meta']);
+		return in_array($property, $view_mode_displayed_metadata['meta']);
 	}
 	return false;
 }
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3bb1c91e3..106b82f00 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -32,7 +32,7 @@ tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
 require $_tests_dir . '/includes/bootstrap.php';
 
 require_once(__DIR__ . '/factories/class-tainacan-entity-factory.php');
-require_once(__DIR__ . '/factories/class-tainacan-field-factory.php');
+require_once( __DIR__ . '/factories/class-tainacan-metadatum-factory.php' );
 require_once(__DIR__ . '/factories/class-tainacan-filter-factory.php');
 require_once(__DIR__ . '/factories/class-tainacan-item-metadata-factory.php');
 require_once(__DIR__ . '/tainacan-unit-test-case.php');
diff --git a/tests/factories/class-tainacan-entity-factory.php b/tests/factories/class-tainacan-entity-factory.php
index b97fe6af2..583df9877 100644
--- a/tests/factories/class-tainacan-entity-factory.php
+++ b/tests/factories/class-tainacan-entity-factory.php
@@ -52,6 +52,8 @@ class Entity_Factory {
 			if($type[$type_size-1] == 'y'){
 				$type[$type_size-1] = 'i';
 				$this->repository_type = "\Tainacan\Repositories\\$type".'es';
+			} elseif($type == 'Metadatum'){
+				$this->repository_type = "\Tainacan\Repositories\Metadata";
 			} else {
 				$this->repository_type = "\Tainacan\Repositories\\$type".'s';
 			}
diff --git a/tests/factories/class-tainacan-field-factory.php b/tests/factories/class-tainacan-field-factory.php
deleted file mode 100644
index 777f3e058..000000000
--- a/tests/factories/class-tainacan-field-factory.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Tainacan\Tests\Factories;
-
-class Field_Factory {
-	private $field;
-	protected $field_type;
-
-	public function create_field($type, $primitive_type = []){
-		if(empty($type)){
-			throw new \InvalidArgumentException('The type can\'t be empty');
-		} elseif(!strrchr($type, '_')){
-			$type = ucfirst(strtolower($type));
-		} else {
-			$type = ucwords(strtolower($type), '_');
-		}
-
-		$this->field_type = "\Tainacan\Field_Types\\$type";
-		$this->field = new $this->field_type(/* Here goes the primitive type */);
-
-		return $this->field;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tests/factories/class-tainacan-item-metadata-factory.php b/tests/factories/class-tainacan-item-metadata-factory.php
index 510548616..6276519f7 100644
--- a/tests/factories/class-tainacan-item-metadata-factory.php
+++ b/tests/factories/class-tainacan-item-metadata-factory.php
@@ -5,9 +5,9 @@ namespace Tainacan\Tests\Factories;
 class Item_Metadata_Factory {
 	private $item_metadata;
 
-	public function create_item_metadata(\Tainacan\Entities\Item $item, \Tainacan\Entities\Field $field, $value = ''){
+	public function create_item_metadata(\Tainacan\Entities\Item $item, \Tainacan\Entities\Metadatum $metadatum, $value = ''){
 		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
-        $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($item, $field);
+        $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum);
         
         if (!empty($value))
             $item_metadata->set_value($value);
diff --git a/tests/factories/class-tainacan-metadatum-factory.php b/tests/factories/class-tainacan-metadatum-factory.php
new file mode 100644
index 000000000..87017aad1
--- /dev/null
+++ b/tests/factories/class-tainacan-metadatum-factory.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Tainacan\Tests\Factories;
+
+class Metadatum_Factory {
+	private $metadatum;
+	protected $metadatum_type;
+
+	public function create_metadatum($type, $primitive_type = []){
+		if(empty($type)){
+			throw new \InvalidArgumentException('The type can\'t be empty');
+		} elseif(!strrchr($type, '_')){
+			$type = ucfirst(strtolower($type));
+		} else {
+			$type = ucwords(strtolower($type), '_');
+		}
+
+		$this->metadatum_type = "\Tainacan\Metadatum_Types\\$type";
+		$this->metadatum = new $this->metadatum_type(/* Here goes the primitive type */);
+
+		return $this->metadatum;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/tainacan-unit-test-case.php b/tests/tainacan-unit-test-case.php
index ce2373784..edfefe085 100644
--- a/tests/tainacan-unit-test-case.php
+++ b/tests/tainacan-unit-test-case.php
@@ -6,7 +6,7 @@ use Tainacan\Tests\Factories;
 
 class TAINACAN_UnitTestCase extends \WP_UnitTestCase {
 	protected $tainacan_entity_factory;
-	protected $tainacan_field_factory;
+	protected $tainacan_metadatum_factory;
 	protected $tainacan_filter_factory;
 	protected $tainacan_item_metadata_factory;
 	protected $user_id;
@@ -14,7 +14,7 @@ class TAINACAN_UnitTestCase extends \WP_UnitTestCase {
 	public function setUp(){
 		parent::setUp();
 		$this->tainacan_entity_factory = new Factories\Entity_Factory();
-		$this->tainacan_field_factory  = new Factories\Field_Factory();
+		$this->tainacan_metadatum_factory  = new Factories\Metadatum_Factory();
 		$this->tainacan_filter_factory = new Factories\Filter_Factory();
 		$this->tainacan_item_metadata_factory = new Factories\Item_Metadata_Factory();
 		
diff --git a/tests/test-api-export.php b/tests/test-api-export.php
index ed6964532..cae4b3bf6 100644
--- a/tests/test-api-export.php
+++ b/tests/test-api-export.php
@@ -18,15 +18,15 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 		
-		$type = $this->tainacan_field_factory->create_field('text');
+		$type = $this->tainacan_metadatum_factory->create_metadatum('text');
 		
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'              => 'teste_Export',
 				'description'       => 'descricao',
 				'collection'        => $collection,
-				'field_type'		=> $type,
+				'metadatum_type'		=> $type,
 				'exposer_mapping'	=> [
 					'dublin-core' => 'language'
 				]
@@ -48,9 +48,9 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase {
 		
 		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 		
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($item, $field);
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum);
 		
-		$item_metadata->set_value('teste_export_field_value');
+		$item_metadata->set_value('teste_export_metadatum_value');
 		
 		$item_metadata->validate();
 		
@@ -67,9 +67,9 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 		
-		$item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($item2, $field);
+		$item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($item2, $metadatum);
 		
-		$item_metadata2->set_value('teste_export_field_value2');
+		$item_metadata2->set_value('teste_export_metadatum_value2');
 		
 		$item_metadata2->validate();
 		
@@ -86,15 +86,15 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 		
-		$item_metadata3 = new \Tainacan\Entities\Item_Metadata_Entity($item3, $field);
+		$item_metadata3 = new \Tainacan\Entities\Item_Metadata_Entity($item3, $metadatum);
 		
-		$item_metadata3->set_value('teste_export_field_value3');
+		$item_metadata3->set_value('teste_export_metadatum_value3');
 		
 		$item_metadata3->validate();
 		
 		$item_metadata3 = $Tainacan_Item_Metadata->insert($item_metadata3);
 		
-		return ['collection' => $collection, 'items' => [$item, $item2, $item3], 'field' => $field, 'items_metadatas' => [$item_metadata, $item_metadata2, $item_metadata3]];
+		return ['collection' => $collection, 'items' => [$item, $item2, $item3], 'metadatum' => $metadatum, 'items_metadatas' => [$item_metadata, $item_metadata2, $item_metadata3]];
 	}
 	
 	public function test_export_a_collection() {
@@ -123,11 +123,11 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals(3, $xml->count());
 		$i = 0;
 		foreach ($xml->children() as $xml_item ) {
-			$fields = $items[$i]->get_fields();
-			foreach ($fields as $field_meta) {
-				$field = $field_meta->get_field();
-				$this->assertEquals($field_meta->get_value(), $xml_item->{$field->get_name()});
-				//echo "{$field->get_name()}:{$field_meta->get_value()}"; // uncomment if need debug
+			$metadata = $items[$i]->get_metadata();
+			foreach ($metadata as $metadatum_meta) {
+				$metadatum = $metadatum_meta->get_metadatum();
+				$this->assertEquals($metadatum_meta->get_value(), $xml_item->{$metadatum->get_name()});
+				//echo "{$metadatum->get_name()}:{$metadatum_meta->get_value()}"; // uncomment if need debug
 			}
 			$i++;
 		}
diff --git a/tests/test-api-exposers.php b/tests/test-api-exposers.php
index 2cec5bfb1..932e5cb11 100644
--- a/tests/test-api-exposers.php
+++ b/tests/test-api-exposers.php
@@ -8,7 +8,7 @@ namespace Tainacan\Tests;
 class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	protected $item;
 	protected $collection;
-	protected $field;
+	protected $metadatum;
 	
 	protected function create_meta_requirements() {
 		$collection = $this->tainacan_entity_factory->create_entity(
@@ -21,15 +21,15 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 			true
 		);
 		
-		$type = $this->tainacan_field_factory->create_field('text');
+		$type = $this->tainacan_metadatum_factory->create_metadatum('text');
 		
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'              => 'teste_Expose',
 				'description'       => 'descricao',
 				'collection'        => $collection,
-				'field_type'		=> $type,
+				'metadatum_type'		=> $type,
 				'exposer_mapping'	=> [
 					'dublin-core' => 'language'
 				]
@@ -50,15 +50,15 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 		);
 		$this->collection = $collection;
 		$this->item = $item;
-		$this->field = $field;
-		return ['collection' => $collection, 'item' => $item, 'field' => $field];
+		$this->metadatum = $metadatum;
+		return ['collection' => $collection, 'item' => $item, 'metadatum' => $metadatum];
 	}
 	
 	/**
 	 * @group value_exposer
 	 */
 	public function test_value_exposer() {
-		global $Tainacan_Fields, $Tainacan_Item_Metadata;
+		global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 		
 		extract($this->create_meta_requirements());
 		
@@ -66,7 +66,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValues_exposers',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		
 		$response = $this->server->dispatch($request);
@@ -81,7 +81,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 		$item_exposer_json = json_encode([
 			'exposer-map'       => 'Value',
 		]);
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->field->get_id() );
+		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->metadatum->get_id() );
 		$request->set_body($item_exposer_json);
 		$response = $this->server->dispatch($request);
 		$this->assertEquals(200, $response->get_status());
@@ -104,7 +104,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	 * @group xml_exposer
 	 */
 	public function test_xml_exposer() {
-		global $Tainacan_Fields, $Tainacan_Item_Metadata;
+		global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 		
 		extract($this->create_meta_requirements());
 		
@@ -112,7 +112,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValues_exposers',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		
 		$response = $this->server->dispatch($request);
@@ -128,7 +128,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 			'exposer-type'       => 'Xml',
 		]);
 		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->field->get_id() );
+		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->metadatum->get_id() );
 		$request->set_body($item_exposer_json);
 		$response = $this->server->dispatch($request);
 		$this->assertEquals(200, $response->get_status());
@@ -139,7 +139,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 		$item_exposer_json = json_encode([
 			'exposer-map'       => 'Dublin Core',
 		]);
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->field->get_id() );
+		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->metadatum->get_id() );
 		$request->set_body($item_exposer_json);
 		$response = $this->server->dispatch($request);
 		$this->assertEquals(200, $response->get_status());
@@ -170,14 +170,14 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	 * @group exposers-slug
 	 */
 	public function test_exposer_map_by_slug() {
-	    global $Tainacan_Fields, $Tainacan_Item_Metadata;
+	    global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 	    extract($this->create_meta_requirements());
 	    
 	    $item__metadata_json = json_encode([
 	        'values'       => 'TestValues_exposers_slug',
 	    ]);
 	    
-	    $request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->field->get_id() );
+	    $request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->metadatum->get_id() );
 	    $request->set_body($item__metadata_json);
 	    
 	    $response = $this->server->dispatch($request);
@@ -192,7 +192,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	    $item_exposer_json = json_encode([
 	        'exposer-map'       => 'dublin-core',
 	    ]);
-	    $request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->field->get_id() );
+	    $request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/'. $this->metadatum->get_id() );
 	    $request->set_body($item_exposer_json);
 	    $response = $this->server->dispatch($request);
 	    $this->assertEquals(200, $response->get_status());
@@ -222,7 +222,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	 * @group oai-pmh
 	 */
 	public function test_oai_pmh() {
-		global $Tainacan_Fields, $Tainacan_Item_Metadata;
+		global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 		
 		extract($this->create_meta_requirements());
 		
@@ -245,7 +245,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	 * @group exposer-type-html
 	 */
 	public function test_html_type() {
-		global $Tainacan_Fields, $Tainacan_Item_Metadata;
+		global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 		
 		extract($this->create_meta_requirements());
 		
@@ -294,7 +294,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	 * @group exposer-type-csv
 	 */
 	public function test_csv_type() {
-		global $Tainacan_Fields, $Tainacan_Item_Metadata;
+		global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 		
 		extract($this->create_meta_requirements());
 		
@@ -302,7 +302,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValues_exposers',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		
 		$response = $this->server->dispatch($request);
@@ -340,7 +340,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	 * @group items_exposer
 	 */
 	public function test_items_exposer() {
-		global $Tainacan_Fields, $Tainacan_Item_Metadata;
+		global $Tainacan_Metadata, $Tainacan_Item_Metadata;
 		
 		extract($this->create_meta_requirements());
 		
@@ -348,7 +348,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValues_exposers',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $this->item->get_id() . '/metadata/' . $this->metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		
 		$response = $this->server->dispatch($request);
@@ -419,16 +419,16 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase {
 	    $Tainacan_collections = \Tainacan\Repositories\Collections::get_instance();
 	    $collection = $Tainacan_collections->fetch($id);
 	    
-	    $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-	    $fields = $Tainacan_Fields->fetch_by_collection( $collection, [ 'order' => 'id' ], 'OBJECT' );
+	    $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+	    $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [ 'order' => 'id' ], 'OBJECT' );
 	    
-	    $this->assertEquals(count($mapper->metadata), count($fields));
-	    foreach ($fields as $field) {
-	        $this->assertTrue(array_key_exists($field->get_slug(), $mapper->metadata));
-	        if(! array_key_exists('core_field', $mapper->metadata[$field->get_slug()]) || $mapper->metadata[$field->get_slug()]['core_field'] == false) {
-	           $this->assertEquals($mapper->metadata[$field->get_slug()]['URI'], $field->get_description());
+	    $this->assertEquals(count($mapper->metadata), count($metadata));
+	    foreach ($metadata as $metadatum) {
+	        $this->assertTrue(array_key_exists($metadatum->get_slug(), $mapper->metadata));
+	        if(! array_key_exists('core_metadatum', $mapper->metadata[$metadatum->get_slug()]) || $mapper->metadata[$metadatum->get_slug()]['core_metadatum'] == false) {
+	           $this->assertEquals($mapper->metadata[$metadatum->get_slug()]['URI'], $metadatum->get_description());
 	        }
-	        $this->assertEquals($mapper->metadata[$field->get_slug()]['label'], $field->get_name());
+	        $this->assertEquals($mapper->metadata[$metadatum->get_slug()]['label'], $metadatum->get_name());
 	    }
 	    
 	}
diff --git a/tests/test-api-field-mappers.php b/tests/test-api-field-mappers.php
deleted file mode 100644
index 27ed67f04..000000000
--- a/tests/test-api-field-mappers.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Tainacan\Tests;
-
-/**
- * @group api
- */
-class TAINACAN_REST_Field_Mappers_Controller extends TAINACAN_UnitApiTestCase {
-
-	public function test_get_field_mappers(){
-
-		$field_mapper_request = new \WP_REST_Request('GET', $this->namespace . '/field-mappers');
-
-		$field_mapper_response = $this->server->dispatch($field_mapper_request);
-
-		$data = $field_mapper_response->get_data();
-
-		$Tainacan_Fields = \Tainacan\Exposers\Exposers::get_instance();
-
-		$field_mappers = $Tainacan_Fields->get_mappers("OBJECT");
-
-		$this->assertEquals(count($field_mappers), count($data));
-		
-	    for ($i = 0; $i < count($data); $i++) {
-	        $this->assertEquals($field_mappers[$i]->slug, $data[$i]['slug']);
-	        $this->assertEquals($field_mappers[$i]->name, $data[$i]['name']);
-	        $this->assertEquals($field_mappers[$i]->allow_extra_fields, $data[$i]['allow_extra_fields']);
-	        $this->assertEquals($field_mappers[$i]->context_url, $data[$i]['context_url']);
-	        $this->assertEquals($field_mappers[$i]->metadata, $data[$i]['metadata']);
-	        $this->assertEquals($field_mappers[$i]->prefix, $data[$i]['prefix']);
-	        $this->assertEquals($field_mappers[$i]->sufix, $data[$i]['sufix']);
-	        $this->assertEquals($field_mappers[$i]->header, $data[$i]['header']);
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tests/test-api-field-types.php b/tests/test-api-field-types.php
deleted file mode 100644
index 9754b50fb..000000000
--- a/tests/test-api-field-types.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Tainacan\Tests;
-
-/**
- * @group api
- */
-class TAINACAN_REST_Field_Types_Controller extends TAINACAN_UnitApiTestCase {
-
-	public function test_get_field_types(){
-
-		$ftype_request = new \WP_REST_Request('GET', $this->namespace . '/field-types');
-
-		$ftype_response = $this->server->dispatch($ftype_request);
-
-		$data = $ftype_response->get_data();
-
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-
-		$field_types = $Tainacan_Fields->fetch_field_types('NAME');
-
-		$this->assertEquals(count($field_types), count($data));
-
-		foreach ($data as $ftype){
-			$this->assertContains($ftype['name'], $field_types);
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tests/test-api-filters.php b/tests/test-api-filters.php
index a0a4b57ee..372a01b24 100644
--- a/tests/test-api-filters.php
+++ b/tests/test-api-filters.php
@@ -18,13 +18,13 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'          => 'Metadata filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
-				'field_type'    => 'Tainacan\Field_Types\Numeric',
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Numeric',
 			),
 			true,
 			true
@@ -40,7 +40,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			)
 		);
 
-		$request = new \WP_REST_Request('POST', $this->namespace . '/collection/' . $collection->get_id() . '/field/' . $field->get_id(). '/filters');
+		$request = new \WP_REST_Request('POST', $this->namespace . '/collection/' . $collection->get_id() . '/metadatum/' . $metadatum->get_id(). '/filters');
 
 		$request->set_body($request_body);
 
@@ -62,10 +62,10 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'        => 'Field filtered',
+				'name'        => 'Metadatum filtered',
 				'description' => 'Is filtered',
 			)
 		);
@@ -78,7 +78,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'        => 'filtro',
 				'collection'  => $collection,
 				'description' => 'descricao',
-				'field'    => $field,
+				'metadatum'    => $metadatum,
 				'filter_type' => $filter_type,
 			),
 			true
@@ -128,10 +128,10 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'        => 'Field filtered',
+				'name'        => 'Metadatum filtered',
 				'description' => 'Is filtered',
 				'collection_id' => $collection->get_id()
 			)
@@ -145,7 +145,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'        => 'filtro',
 				'collection'  => $collection,
 				'description' => 'descricao',
-				'field'    => $field,
+				'metadatum'    => $metadatum,
 				'filter_type' => $filter_type,
 			),
 			true
@@ -179,24 +179,24 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'          => 'Field filtered',
+				'name'          => 'Metadatum filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
-				'field_type'    => 'Tainacan\Field_Types\Numeric'
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Numeric'
 			),
 			true
 		);
 
-		$field2 = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum2 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'          => 'Other filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
-				'field_type'    => 'Tainacan\Field_Types\Numeric'
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Numeric'
 			),
 			true
 		);
@@ -209,7 +209,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'        => 'filtro',
 				'collection'  => $collection,
 				'description' => 'descricao',
-				'field'       => $field,
+				'metadatum'       => $metadatum,
 				'filter_type' => $filter_type,
 				'status'      => 'publish'
 			),
@@ -222,7 +222,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'        => 'filtro2',
 				'collection'  => $collection,
 				'description' => 'descricao',
-				'field'       => $field2,
+				'metadatum'       => $metadatum2,
 				'filter_type' => $filter_type,
 				'status'      => 'publish'
 			),
@@ -267,24 +267,24 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'          => 'Field filtered',
+				'name'          => 'Metadatum filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
-				'field_type'    => 'Tainacan\Field_Types\Text'
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Text'
 			),
 			true
 		);
 
-		$field2 = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum2 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'          => 'Field filtered',
+				'name'          => 'Metadatum filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => 'default',
-				'field_type'    => 'Tainacan\Field_Types\Text'
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Text'
 			),
 			true
 		);
@@ -296,7 +296,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'description' => 'Description of 2x Filter',
 				'status'      => 'publish'
 			],
-			'field'       => $field2->get_id()
+			'metadatum'       => $metadatum2->get_id()
 		]);
 
 		$filter_attr2 = json_encode([
@@ -306,7 +306,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'description' => 'Description of 4x Filter',
 				'status'      => 'publish'
 			],
-			'field'       => $field->get_id()
+			'metadatum'       => $metadatum->get_id()
 		]);
 
 		#### CREATE A FILTER IN REPOSITORY ####
@@ -321,7 +321,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals('filter_in_repository', $data['collection_id']);
 
 
-		#### CREATE A FILTER IN COLLECTION WITHOUT FIELD ASSOCIATION ####
+		#### CREATE A FILTER IN COLLECTION WITHOUT METADATUM ASSOCIATION ####
 
 		$collection = $this->tainacan_entity_factory->create_entity('collection', [], true);
 
diff --git a/tests/test-api-item-metadata.php b/tests/test-api-item-metadata.php
index 8d5961450..d2050cb3f 100644
--- a/tests/test-api-item-metadata.php
+++ b/tests/test-api-item-metadata.php
@@ -8,7 +8,7 @@ namespace Tainacan\Tests;
 class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 	protected $item;
 	protected $collection;
-	protected $field;
+	protected $metadatum;
 	
 	protected function create_meta_requirements() {
 		$collection = $this->tainacan_entity_factory->create_entity(
@@ -21,15 +21,15 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 		
-		$type = $this->tainacan_field_factory->create_field('text');
+		$type = $this->tainacan_metadatum_factory->create_metadatum('text');
 		
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'              => 'teste_metadado',
 				'description'       => 'descricao',
 				'collection'        => $collection,
-				'field_type'		=> $type,
+				'metadatum_type'		=> $type,
 				'accept_suggestion'	=> true
 			),
 			true,
@@ -48,8 +48,8 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		);
 		$this->collection = $collection;
 		$this->item = $item;
-		$this->field = $field;
-		return ['collection' => $collection, 'item' => $item, 'field' => $field];
+		$this->metadatum = $metadatum;
+		return ['collection' => $collection, 'item' => $item, 'metadatum' => $metadatum];
 	}
 	
 	public function test_create_suggestion_item_metadata_in_a_collection(){
@@ -60,7 +60,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValues_metadado',
 		]);
 
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 
 		$response = $this->server->dispatch($request);
@@ -72,7 +72,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals($item->get_id() , $data['item']['id']);
 		$this->assertEquals('TestValues_metadado', $data['value']);
 		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $field->get_id() );
+		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $metadatum->get_id() );
 		$response = $this->server->dispatch($request);
 		$this->assertEquals(200, $response->get_status());
 		$data = $response->get_data();
@@ -86,7 +86,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValuesSuggestion_metadado',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		$response = $this->server->dispatch($request);
 		
@@ -114,7 +114,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		
 		$this->assertEquals(200, $response->get_status());
 		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $field->get_id()  );
+		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $metadatum->get_id()  );
 		$response = $this->server->dispatch($request);
 		$this->assertEquals(200, $response->get_status());
 		$data = $response->get_data();
@@ -129,7 +129,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValues_metadado',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		
 		$response = $this->server->dispatch($request);
@@ -146,7 +146,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			'values'       => 'TestValuesAnonymousSuggestion_metadado',
 		]);
 		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $field->get_id() );
+		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
 		$request->set_body($item__metadata_json);
 		$response = $this->server->dispatch($request);
 		
@@ -174,7 +174,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		
 		$this->assertEquals(200, $response->get_status());
 		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $field->get_id()  );
+		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $metadatum->get_id()  );
 		$response = $this->server->dispatch($request);
 		$this->assertEquals(200, $response->get_status());
 		$data = $response->get_data();
diff --git a/tests/test-api-metadata.php b/tests/test-api-metadata.php
index 1e03b67e4..3fa6a261c 100644
--- a/tests/test-api-metadata.php
+++ b/tests/test-api-metadata.php
@@ -7,7 +7,7 @@ namespace Tainacan\Tests;
  */
 class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
-	public function test_create_field_in_a_collection() {
+	public function test_create_metadatum_in_a_collection() {
 		$collection = $this->tainacan_entity_factory->create_entity('collection', '', true);
 
 		$this->tainacan_entity_factory->create_entity(
@@ -20,30 +20,30 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = json_encode(
+		$metadatum = json_encode(
 			array(
 				'name'        => 'Moeda',
 				'description' => 'Descreve campo moeda.',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			)
 		);
         
 		$request = new \WP_REST_Request(
 			'POST',
-			$this->namespace . '/collection/' . $collection->get_id() . '/fields'
+			$this->namespace . '/collection/' . $collection->get_id() . '/metadata'
 		);
-		$request->set_body($field);
+		$request->set_body($metadatum);
 
 		$response = $this->server->dispatch($request);
 
-		$field_added = $response->get_data();
-		$this->assertTrue(is_array($field_added) && array_key_exists('name', $field_added), sprintf('cannot create field, response: %s', print_r($field_added, true)));
-		$this->assertEquals('Moeda', $field_added['name']);
+		$metadatum_added = $response->get_data();
+		$this->assertTrue(is_array($metadatum_added) && array_key_exists('name', $metadatum_added), sprintf('cannot create metadatum, response: %s', print_r($metadatum_added, true)));
+		$this->assertEquals('Moeda', $metadatum_added['name']);
 
-		$this->assertNotEquals('default', $field_added['collection_id']);
+		$this->assertNotEquals('default', $metadatum_added['collection_id']);
 	}
 
-	public function test_fetch_a_field_from_a_collection(){
+	public function test_fetch_a_metadatum_from_a_collection(){
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -53,52 +53,52 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$fieldA = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatumA = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'        => 'Data',
 				'description' => 'Descreve valor do campo data.',
 				'collection'  => $collection,
 				'status'      => 'publish',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			), true
 		);
 
-		$request = new \WP_REST_Request('GET', $this->namespace . '/collection/' . $collection->get_id() . '/fields/' . $fieldA->get_id());
+		$request = new \WP_REST_Request('GET', $this->namespace . '/collection/' . $collection->get_id() . '/metadata/' . $metadatumA->get_id());
 
 		$response = $this->server->dispatch($request);
 
 		$data = $response->get_data();
 
 		$this->assertEquals('Data', $data['name']);
-		$this->assertEquals($fieldA->get_id(), $data['id']);
+		$this->assertEquals($metadatumA->get_id(), $data['id']);
 	}
 
-	public function test_create_default_field(){
-		$field = json_encode(
+	public function test_create_default_metadatum(){
+		$metadatum = json_encode(
 			array(
 				'name'        => 'Ano de Publicação',
 				'description' => 'Uma data no formato dd/mm/aaaa.',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			)
 		);
 
 		$request = new \WP_REST_Request(
 			'POST',
-			$this->namespace . '/fields'
+			$this->namespace . '/metadata'
 		);
-		$request->set_body($field);
+		$request->set_body($metadatum);
 
 		$response = $this->server->dispatch($request);
-		$field_added = $response->get_data();
+		$metadatum_added = $response->get_data();
 
-		$this->assertTrue(is_array($field_added) && array_key_exists('name', $field_added), sprintf('cannot create field, response: %s', print_r($field_added, true)));
-		$this->assertEquals('Ano de Publicação', $field_added['name']);
+		$this->assertTrue(is_array($metadatum_added) && array_key_exists('name', $metadatum_added), sprintf('cannot create metadatum, response: %s', print_r($metadatum_added, true)));
+		$this->assertEquals('Ano de Publicação', $metadatum_added['name']);
 
-		$this->assertEquals('default', $field_added['collection_id']);
+		$this->assertEquals('default', $metadatum_added['collection_id']);
 	}
 
-	public function test_fetch_default_fields(){
+	public function test_fetch_default_metadata(){
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -108,29 +108,29 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$fieldA = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatumA = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'        => 'Data 1',
 				'description' => 'Descreve valor do campo data.',
 				'collection'  => $collection,
 				'status'      => 'publish',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			), true
 		);
 
-		$fieldB = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatumB = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'           => 'Data 2',
 				'description'    => 'Descreve valor do campo data.',
 				'collection_id'  => 'default',
 				'status'         => 'publish',
-				'field_type'     => 'Tainacan\Field_Types\Text',
+				'metadatum_type'     => 'Tainacan\Metadatum_Types\Text',
 			), true
 		);
 
-		$request_fetch_defaults = new \WP_REST_Request('GET', $this->namespace . '/fields');
+		$request_fetch_defaults = new \WP_REST_Request('GET', $this->namespace . '/metadata');
 
 		$response_defaults = $this->server->dispatch($request_fetch_defaults);
 
@@ -164,40 +164,40 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'        => 'Data',
 				'description' => 'Descreve valor do campo data.',
 				'collection'  => $collection,
 				'status'      => 'publish',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			),
 			true
 		);
 
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($item, $field);
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum);
 		$item_metadata->set_value('12/12/2017');
 
 		$item_metadata->validate();
 		$Tainacan_Item_Metadata->insert($item_metadata);
 
-		#################### Get field of collection ######################
+		#################### Get metadatum of collection ######################
 
 		$request = new \WP_REST_Request(
 			'GET',
-			$this->namespace . '/collection/' . $collection->get_id() . '/fields'
+			$this->namespace . '/collection/' . $collection->get_id() . '/metadata'
 		);
 
 		$response = $this->server->dispatch($request);
 
 		$data = $response->get_data();
 
-		$fields_names = array_map(function($field) {return $field['name'];}, $data);
+		$metadata_names = array_map(function($metadatum) {return $metadatum['name'];}, $data);
 
-		$this->assertContains('Data', $fields_names);
+		$this->assertContains('Data', $metadata_names);
 
-		################### Get field of item with value #######################
+		################### Get metadatum of item with value #######################
 
 		$request = new \WP_REST_Request(
 			'GET',
@@ -207,13 +207,13 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		$response = $this->server->dispatch($request);
 
 		$data = $response->get_data();
-		$this->assertTrue(is_array($data) && array_key_exists(0, $data), sprintf('cannot read field, response: %s', print_r($data, true)));
+		$this->assertTrue(is_array($data) && array_key_exists(0, $data), sprintf('cannot read metadatum, response: %s', print_r($data, true)));
 
 
-		$fields_names = array_map(function($item_metadata) {return $item_metadata['field']['name'];}, $data);
+		$metadata_names = array_map(function($item_metadata) {return $item_metadata['metadatum']['name'];}, $data);
 		$values = array_map(function($item_metadata) {return $item_metadata['value'];}, $data);
 
-        $this->assertContains('Data', $fields_names);
+        $this->assertContains('Data', $metadata_names);
         $this->assertContains('12/12/2017', $values);
 	}
 
@@ -237,14 +237,14 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'        => 'Data',
 				'description' => 'Descreve o dado do campo data.',
 				'collection'  => $collection,
 				'status'      => 'publish',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 				'multiple'    => 'yes'
 			),
 			true
@@ -261,7 +261,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
 		$request = new \WP_REST_Request(
 			'PATCH',
-			$this->namespace . '/item/' . $item->get_id() . '/metadata/' . $field->get_id()
+			$this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id()
 		);
 		$request->set_body($meta_values);
 
@@ -269,15 +269,15 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
 		$item_metadata_updated = $response->get_data();
 
-		$field_updated = $item_metadata_updated['field'];
+		$metadatum_updated = $item_metadata_updated['metadatum'];
 
-		$this->assertEquals($field->get_id(), $field_updated['id']);
+		$this->assertEquals($metadatum->get_id(), $metadatum_updated['id']);
 
 		$this->assertEquals('19/01/2018', $item_metadata_updated['value'][0]);
 		$this->assertEquals('19/02/2018', $item_metadata_updated['value'][1]);
 
 
-		#### UPDATE FIELD IN COLLECTION ####
+		#### UPDATE METADATUM IN COLLECTION ####
         
 		$values = json_encode([
 			'name'        => 'Dia/Mês/Ano',
@@ -286,7 +286,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
 		$request = new \WP_REST_Request(
 			'PATCH',
-			$this->namespace . '/collection/' . $collection->get_id() . '/fields/' . $field->get_id()
+			$this->namespace . '/collection/' . $collection->get_id() . '/metadata/' . $metadatum->get_id()
 		);
 
 		$request->set_body($values);
@@ -295,7 +295,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
 		$data = $response->get_data();
         
-		$this->assertEquals($field->get_id(), $data['id']);
+		$this->assertEquals($metadatum->get_id(), $data['id']);
 		$this->assertEquals('Dia/Mês/Ano', $data['name']);
 
 		// Mantém-se o valor antigo no item
@@ -305,7 +305,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
         
 	}
 
-	public function test_trash_field_in_collection(){
+	public function test_trash_metadatum_in_collection(){
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -315,70 +315,70 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'        => 'Field Statement',
+				'name'        => 'Metadatum Statement',
 				'description' => 'No Statement',
 				'collection'  => $collection,
 				'status'      => 'publish',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 				'multiple'    => 'yes'
 			),
 			true
 		);
 
-		$trash_field_request = new \WP_REST_Request(
+		$trash_metadatum_request = new \WP_REST_Request(
 			'DELETE',
-			$this->namespace . '/collection/'. $collection->get_id() . '/fields/' . $field->get_id()
+			$this->namespace . '/collection/'. $collection->get_id() . '/metadata/' . $metadatum->get_id()
 		);
 
-		$trash_field_response = $this->server->dispatch($trash_field_request);
-		$data1 = $trash_field_response->get_data();
+		$trash_metadatum_response = $this->server->dispatch($trash_metadatum_request);
+		$data1 = $trash_metadatum_response->get_data();
 
-		$this->assertEquals($field->get_id(), $data1['id']);
+		$this->assertEquals($metadatum->get_id(), $data1['id']);
 
-		$field_trashed = get_post($data1['id']);
-		$this->assertEquals('trash', $field_trashed->post_status);
+		$metadatum_trashed = get_post($data1['id']);
+		$this->assertEquals('trash', $metadatum_trashed->post_status);
 	}
 
-	public function test_trash_default_field(){
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+	public function test_trash_default_metadatum(){
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'          => 'Field Statement',
+				'name'          => 'Metadatum Statement',
 				'description'   => 'No Statement',
 				'collection_id' => 'default',
 				'status'        => 'publish',
-				'field_type'    => 'Tainacan\Field_Types\Text',
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Text',
 				'multiple'      => 'yes'
 			),
 			true
 		);
 
-		$trash_field_request = new \WP_REST_Request(
+		$trash_metadatum_request = new \WP_REST_Request(
 			'DELETE',
-			$this->namespace . '/fields/' . $field->get_id()
+			$this->namespace . '/metadata/' . $metadatum->get_id()
 		);
 
-		$trash_field_response = $this->server->dispatch($trash_field_request);
-		$data1 = $trash_field_response->get_data();
+		$trash_metadatum_response = $this->server->dispatch($trash_metadatum_request);
+		$data1 = $trash_metadatum_response->get_data();
 
-		$this->assertEquals($field->get_id(), $data1['id']);
+		$this->assertEquals($metadatum->get_id(), $data1['id']);
 
-		$field_trashed = get_post($data1['id']);
-		$this->assertEquals('trash', $field_trashed->post_status);
+		$metadatum_trashed = get_post($data1['id']);
+		$this->assertEquals('trash', $metadatum_trashed->post_status);
 	}
 
-	public function test_update_default_field(){
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+	public function test_update_default_metadatum(){
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
-				'name'          => 'Field Statement',
+				'name'          => 'Metadatum Statement',
 				'description'   => 'No Statement',
 				'collection_id' => 'default',
 				'status'        => 'publish',
-				'field_type'    => 'Tainacan\Field_Types\Text',
+				'metadatum_type'    => 'Tainacan\Metadatum_Types\Text',
 				'multiple'      => 'no'
 			),
 			true
@@ -391,7 +391,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
 		$request = new \WP_REST_Request(
 			'PATCH',
-			$this->namespace . '/fields/' . $field->get_id()
+			$this->namespace . '/metadata/' . $metadatum->get_id()
 		);
 
 		$request->set_body($new_attributes);
@@ -400,11 +400,11 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 
 		$data = $response->get_data();
 
-		$this->assertEquals($field->get_id(), $data['id']);
+		$this->assertEquals($metadatum->get_id(), $data['id']);
 		$this->assertEquals('No name', $data['name']);
 	}
 
-	public function test_fetch_all_field_values(){
+	public function test_fetch_all_metadatum_values(){
 		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
 		$collection = $this->tainacan_entity_factory->create_entity(
@@ -439,25 +439,25 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$field = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			array(
 				'name'        => 'Data',
 				'description' => 'Descreve valor do campo data.',
 				'collection'  => $collection,
 				'status'      => 'publish',
-				'field_type'  => 'Tainacan\Field_Types\Text',
+				'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			),
 			true
 		);
 
-		$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($item1, $field);
+		$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($item1, $metadatum);
 		$item_metadata1->set_value('12/12/2017');
 
 		$item_metadata1->validate();
 		$Tainacan_Item_Metadata->insert($item_metadata1);
 
-		$item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($item2, $field);
+		$item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($item2, $metadatum);
 		$item_metadata2->set_value('02/03/2018');
 
 		$item_metadata2->validate();
@@ -466,12 +466,12 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		//=======================
 
 		$query = [
-			'fetch' => 'all_field_values'
+			'fetch' => 'all_metadatum_values'
 		];
 
 		$request = new \WP_REST_Request(
 			'GET',
-			$this->namespace . '/collection/' . $collection->get_id() . '/fields/' . $field->get_id()
+			$this->namespace . '/collection/' . $collection->get_id() . '/metadata/' . $metadatum->get_id()
 		);
 		$request->set_query_params($query);
 
diff --git a/tests/test-api-metadatum-mappers.php b/tests/test-api-metadatum-mappers.php
new file mode 100644
index 000000000..69cecb2d5
--- /dev/null
+++ b/tests/test-api-metadatum-mappers.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tainacan\Tests;
+
+/**
+ * @group api
+ */
+class TAINACAN_REST_Metadatum_Mappers_Controller extends TAINACAN_UnitApiTestCase {
+
+	public function test_get_metadatum_mappers(){
+
+		$metadatum_mapper_request = new \WP_REST_Request('GET', $this->namespace . '/metadatum-mappers');
+
+		$metadatum_mapper_response = $this->server->dispatch($metadatum_mapper_request);
+
+		$data = $metadatum_mapper_response->get_data();
+
+		$Tainacan_Metadata = \Tainacan\Exposers\Exposers::get_instance();
+
+		$metadatum_mappers = $Tainacan_Metadata->get_mappers("OBJECT");
+
+		$this->assertEquals(count($metadatum_mappers), count($data));
+		
+	    for ($i = 0; $i < count($data); $i++) {
+	        $this->assertEquals($metadatum_mappers[$i]->slug, $data[$i]['slug']);
+	        $this->assertEquals($metadatum_mappers[$i]->name, $data[$i]['name']);
+	        $this->assertEquals($metadatum_mappers[$i]->allow_extra_metadata, $data[$i]['allow_extra_metadata']);
+	        $this->assertEquals($metadatum_mappers[$i]->context_url, $data[$i]['context_url']);
+	        $this->assertEquals($metadatum_mappers[$i]->metadata, $data[$i]['metadata']);
+	        $this->assertEquals($metadatum_mappers[$i]->prefix, $data[$i]['prefix']);
+	        $this->assertEquals($metadatum_mappers[$i]->sufix, $data[$i]['sufix']);
+	        $this->assertEquals($metadatum_mappers[$i]->header, $data[$i]['header']);
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/test-api-metadatum-types.php b/tests/test-api-metadatum-types.php
new file mode 100644
index 000000000..d2dd7f3dd
--- /dev/null
+++ b/tests/test-api-metadatum-types.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tainacan\Tests;
+
+/**
+ * @group api
+ */
+class TAINACAN_REST_Metadatum_Types_Controller extends TAINACAN_UnitApiTestCase {
+
+	public function test_get_metadatum_types(){
+
+		$ftype_request = new \WP_REST_Request('GET', $this->namespace . '/metadatum-types');
+
+		$ftype_response = $this->server->dispatch($ftype_request);
+
+		$data = $ftype_response->get_data();
+
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+
+		$metadatum_types = $Tainacan_Metadata->fetch_metadatum_types('NAME');
+
+		$this->assertEquals(count($metadatum_types), count($data));
+
+		foreach ($data as $ftype){
+			$this->assertContains($ftype['name'], $metadatum_types);
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/test-api-queries.php b/tests/test-api-queries.php
index 62c2fab87..fd25a9f79 100644
--- a/tests/test-api-queries.php
+++ b/tests/test-api-queries.php
@@ -104,59 +104,59 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		// Create Metadata and Field Type
+		// Create Metadata and Metadatum Type
 
-		$field_type = $this->tainacan_field_factory->create_field('text');
+		$metadatum_type = $this->tainacan_metadatum_factory->create_metadatum('text');
 
-		$fieldA1 = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatumA1 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			[
-				'name'        => 'Field A-1',
-				'description' => 'Simple field in collection A',
+				'name'        => 'Metadatum A-1',
+				'description' => 'Simple metadatum in collection A',
 				'status'      => 'publish',
 				'collection'  => $collectionA,
-				'field_type'  => $field_type
+				'metadatum_type'  => $metadatum_type
 			],
 			true
 		);
 
-		$fieldA2 = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatumA2 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			[
-				'name'        => 'Field A-2',
-				'description' => 'Simple field in collection A',
+				'name'        => 'Metadatum A-2',
+				'description' => 'Simple metadatum in collection A',
 				'status'      => 'publish',
 				'collection'  => $collectionA,
-				'field_type'  => $field_type
+				'metadatum_type'  => $metadatum_type
 			],
 			true
 		);
 
-		$fieldA3 = $this->tainacan_entity_factory->create_entity(
-			'field',
+		$metadatumA3 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
 			[
-				'name'        => 'Field A-3',
-				'description' => 'Multiple field in a collection A',
+				'name'        => 'Metadatum A-3',
+				'description' => 'Multiple metadatum in a collection A',
 				'status'      => 'publish',
 				'collection'  => $collectionA,
-				'field_type'  => $field_type,
+				'metadatum_type'  => $metadatum_type,
 				'multiple'    => 'yes'
 			],
 			true
 		);
 
 		// Create a Item Metadata
-		$itemA1_metadata1 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA1, $fieldA1, 'E');
-		$itemA1_metadata2 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA1, $fieldA2, 'X');
-		$itemA1_metadata3 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA1, $fieldA3, ['Y', 'Z']);
+		$itemA1_metadata1 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA1, $metadatumA1, 'E');
+		$itemA1_metadata2 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA1, $metadatumA2, 'X');
+		$itemA1_metadata3 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA1, $metadatumA3, ['Y', 'Z']);
 
-		$itemA2_metadata1 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA2, $fieldA1, 'D');
-		$itemA2_metadata2 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA2, $fieldA2, 'Q');
-		$itemA2_metadata3 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA2, $fieldA3, ['R', 'S']);
+		$itemA2_metadata1 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA2, $metadatumA1, 'D');
+		$itemA2_metadata2 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA2, $metadatumA2, 'Q');
+		$itemA2_metadata3 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA2, $metadatumA3, ['R', 'S']);
 
-		$itemA3_metadata1 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA3, $fieldA1, 'G');
-		$itemA3_metadata2 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA3, $fieldA2, 'T');
-		$itemA3_metadata3 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA3, $fieldA3, ['Q', 'V']);
+		$itemA3_metadata1 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA3, $metadatumA1, 'G');
+		$itemA3_metadata2 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA3, $metadatumA2, 'T');
+		$itemA3_metadata3 = $this->tainacan_item_metadata_factory->create_item_metadata($itemA3, $metadatumA3, ['Q', 'V']);
 
 		//
 
@@ -194,17 +194,17 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase {
 
 		/* Meta Query:
 		 *
-		 * Fetch items from a collection desc ordered by fieldA1 and its only in range A to F.
+		 * Fetch items from a collection desc ordered by metadatumA1 and its only in range A to F.
 		 *
 		 * */
 
 		$meta_query = [
-			'metakey'   => $fieldA1->get_id(),
+			'metakey'   => $metadatumA1->get_id(),
 			'orderby'   => 'meta_value',
 			'order'     => 'DESC',
 			'metaquery' => array(
 				array(
-					'key'     => $fieldA1->get_id(),
+					'key'     => $metadatumA1->get_id(),
 					'value'   => array( 'A', 'F' ),
 					'compare' => 'BETWEEN'
 				),
@@ -220,15 +220,15 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase {
 
 		$this->assertCount(2, $data3);
 
-		$fieldA1_slug = $fieldA1->get_slug();
+		$metadatumA1_slug = $metadatumA1->get_slug();
 
-		$values = [$data3[0]['metadata'][$fieldA1_slug]['value'], $data3[1]['metadata'][$fieldA1_slug]['value']];
+		$values = [$data3[0]['metadata'][$metadatumA1_slug]['value'], $data3[1]['metadata'][$metadatumA1_slug]['value']];
 
 		$this->assertNotContains('G', $values);
 
 		// E have to come first, because DESC
-		$this->assertEquals('E', $data3[0]['metadata'][$fieldA1_slug]['value']);
-		$this->assertEquals('D', $data3[1]['metadata'][$fieldA1_slug]['value']);
+		$this->assertEquals('E', $data3[0]['metadata'][$metadatumA1_slug]['value']);
+		$this->assertEquals('D', $data3[1]['metadata'][$metadatumA1_slug]['value']);
 
 
 		/* Date Query:
@@ -277,7 +277,7 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase {
 			'taxquery' => [
 				[
 					'taxonomy' => $taxonomyA->get_db_identifier(),
-					'field'    => 'slug',
+					'metadatum'    => 'slug',
 					'terms'    => 'term-a'
 				]
 			]
diff --git a/tests/test-category-field-types.php b/tests/test-category-metadatum-types.php
similarity index 71%
rename from tests/test-category-field-types.php
rename to tests/test-category-metadatum-types.php
index b21f663fd..992755656 100644
--- a/tests/test-category-field-types.php
+++ b/tests/test-category-metadatum-types.php
@@ -13,12 +13,12 @@ use Tainacan\Entities;
 /**
  * Sample test case.
  */
-class CategoryFieldTypes extends TAINACAN_UnitTestCase {
+class CategoryMetadatumTypes extends TAINACAN_UnitTestCase {
 
 	
-    function test_category_field_types() {
+    function test_category_metadatum_types() {
 
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         
@@ -39,15 +39,15 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
         
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Category',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Category',
 				'status'	 => 'publish',
-				'field_type_options' => [
+				'metadatum_type_options' => [
 					'taxonomy_id' => $tax->get_id(),
 					'allow_new_terms' => false
 				]
@@ -66,13 +66,13 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 		
-        $field2 = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum2 = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta2',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Category',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Category',
 				'status'	 => 'draft',
 	        ),
 	        true
@@ -91,26 +91,26 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 		    true
 	    );
 
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
 		$item_metadata->set_value('Red');
 
 		$this->assertTrue($item_metadata->validate(), 'item metadata should validate because it is an existing term');
 
 		$Tainacan_Item_Metadata->insert($item_metadata);
 
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
 		$item_metadata->set_value('love');
 
 		$this->assertFalse($item_metadata->validate(), 'item metadata should not validate because it does not allow new terms');
 
 		// Lets change it
-		$options = $field->get_field_type_options();
+		$options = $metadatum->get_metadatum_type_options();
 		$options['allow_new_terms'] = true;
-		$field->set_field_type_options($options);
-		$field->validate();
-		$field = $Tainacan_Fields->insert($field);
+		$metadatum->set_metadatum_type_options($options);
+		$metadatum->validate();
+		$metadatum = $Tainacan_Metadata->insert($metadatum);
 
-		$item_metadata->set_field($field);
+		$item_metadata->set_metadatum($metadatum);
 
 		$this->assertTrue($item_metadata->validate(), 'item metada should validate because it now allows new terms');
 
@@ -118,24 +118,24 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 
 		$checkItem = $Tainacan_Items->fetch($i->get_id());
 
-		$check_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($checkItem, $field);
+		$check_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($checkItem, $metadatum);
 
 		$this->assertEquals('Tainacan\Entities\Term', get_class($check_item_metadata->get_value()));
 		
-		// test 2 fields with same category
-		$field2->set_field_type_options([
+		// test 2 metadata with same category
+		$metadatum2->set_metadatum_type_options([
 			'taxonomy_id' => $tax->get_id(),
 		]);
-		$field2->set_status('publish');
+		$metadatum2->set_status('publish');
 		
-		$this->assertFalse($field2->validate(), 'Category Field should not validate when using a category in use by another field in the same collection');
-		$errors = $field2->get_errors();
+		$this->assertFalse($metadatum2->validate(), 'Category Metadatum should not validate when using a category in use by another metadatum in the same collection');
+		$errors = $metadatum2->get_errors();
 		$this->assertInternalType('array', $errors);
-		$this->assertArrayHasKey('taxonomy_id', $errors[0]['field_type_options']);
+		$this->assertArrayHasKey('taxonomy_id', $errors[0]['metadatum_type_options']);
     }
 	
 	function test_relate_taxonomy() {
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
         
         $collection = $this->tainacan_entity_factory->create_entity(
@@ -162,15 +162,15 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
         
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Category',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Category',
 				'status'	 => 'publish',
-				'field_type_options' => [
+				'metadatum_type_options' => [
 					'taxonomy_id' => $tax->get_id(),
 					'allow_new_terms' => false
 				]
@@ -179,26 +179,26 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
         );
         
 		$checkTax = $Tainacan_Taxonomies->fetch($tax->get_id());
-		$this->assertContains($collection->get_id(), $checkTax->get_collections_ids(), 'Collection must be added to taxonomy when field is created');
+		$this->assertContains($collection->get_id(), $checkTax->get_collections_ids(), 'Collection must be added to taxonomy when metadatum is created');
 		
-		$field->set_field_type_options([
+		$metadatum->set_metadatum_type_options([
 			'taxonomy_id' => $tax2->get_id(),
 			'allow_new_terms' => false
 		]);
 		
-		$field->validate();
-		$field = $Tainacan_Fields->insert($field);
+		$metadatum->validate();
+		$metadatum = $Tainacan_Metadata->insert($metadatum);
 		
 		$checkTax = $Tainacan_Taxonomies->fetch($tax->get_id());
 		$checkTax2 = $Tainacan_Taxonomies->fetch($tax2->get_id());
-		$this->assertContains($collection->get_id(), $checkTax2->get_collections_ids(), 'Collection must be added to taxonomy when field is updated');
-		$this->assertNotContains($collection->get_id(), $checkTax->get_collections_ids(), 'Collection must be removed from taxonomy when field is updated');
+		$this->assertContains($collection->get_id(), $checkTax2->get_collections_ids(), 'Collection must be added to taxonomy when metadatum is updated');
+		$this->assertNotContains($collection->get_id(), $checkTax->get_collections_ids(), 'Collection must be removed from taxonomy when metadatum is updated');
 		
-		$field = $Tainacan_Fields->delete($field->get_id());
+		$metadatum = $Tainacan_Metadata->delete($metadatum->get_id());
 		
 		$checkTax2 = $Tainacan_Taxonomies->fetch($tax2->get_id());
 		
-		$this->assertNotContains($collection->get_id(), $checkTax2->get_collections_ids(), 'Collection must be removed from taxonomy when field is deleted');
+		$this->assertNotContains($collection->get_id(), $checkTax2->get_collections_ids(), 'Collection must be removed from taxonomy when metadatum is deleted');
 		
 		
 		
@@ -207,7 +207,7 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
     }
 	
 	function test_values_and_html() {
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
         $Tainacan_ItemMetadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         
@@ -237,15 +237,15 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 				true
 				);
 		
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Category',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Category',
 				'status'	 => 'publish',
-				'field_type_options' => [
+				'metadatum_type_options' => [
 					'taxonomy_id' => $tax->get_id(),
 					'allow_new_terms' => true
 				]
@@ -255,7 +255,7 @@ class CategoryFieldTypes extends TAINACAN_UnitTestCase {
 		
 	
         
-		$meta = new \Tainacan\Entities\Item_Metadata_Entity($item, $field);
+		$meta = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum);
 		
 		$meta->set_value('new_term');
 		
diff --git a/tests/test-compound-field-types.php b/tests/test-compound-metadatum-types.php
similarity index 50%
rename from tests/test-compound-field-types.php
rename to tests/test-compound-metadatum-types.php
index 3b9a9a772..a5549f52e 100644
--- a/tests/test-compound-field-types.php
+++ b/tests/test-compound-metadatum-types.php
@@ -13,12 +13,12 @@ use Tainacan\Entities;
 /**
  * Sample test case.
  */
-class CompoundFieldTypes extends TAINACAN_UnitTestCase {
+class CompoundMetadatumTypes extends TAINACAN_UnitTestCase {
 
 	
-    function test_compound_field_types() {
+    function test_compound_metadatum_types() {
 
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         
@@ -30,40 +30,40 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 		
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Compound',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Compound',
 				'status'	 => 'publish',
 	        ),
 	        true
         );
         
-        $field_child1 = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum_child1 = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta2',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Text',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Text',
 				'status'	 => 'publish',
-				'parent' 	 => $field->get_id(),
+				'parent' 	 => $metadatum->get_id(),
 	        ),
 	        true
         );
 		
-		$field_child2 = $this->tainacan_entity_factory->create_entity(
-        	'field',
+		$metadatum_child2 = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta3',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Text',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Text',
 				'status'	 => 'publish',
-				'parent' 	 => $field->get_id(),
+				'parent' 	 => $metadatum->get_id(),
 	        ),
 	        true
         );
@@ -80,21 +80,21 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 	   
-		$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($i, $field_child1);
+		$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_child1);
 		$item_metadata1->set_value('Red');
 		
 		$item_metadata1->validate();
 
 		$item_metadata1 = $Tainacan_Item_Metadata->insert($item_metadata1);
 		
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field_child2, null, $item_metadata1->get_parent_meta_id());
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_child2, null, $item_metadata1->get_parent_meta_id());
 		$item_metadata->set_value('Blue');
 		
 		$item_metadata->validate();
 
 		$item_metadata = $Tainacan_Item_Metadata->insert($item_metadata);
 		
-		$compoundItem = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+		$compoundItem = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
 		
 		global $wpdb;
 		
@@ -103,21 +103,21 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		$this->assertTrue( is_array($compoundValue), 'value of a compound should return array' );
 		$this->assertEquals( 2, sizeof($compoundValue), 'value should have 2 item metadata' );
 		
-		$this->assertTrue( isset($compoundValue[$field_child1->get_id()]), 'First element of value must be set' );
-		$this->assertTrue( isset($compoundValue[$field_child2->get_id()]), 'Second element of value must be set' );
+		$this->assertTrue( isset($compoundValue[$metadatum_child1->get_id()]), 'First element of value must be set' );
+		$this->assertTrue( isset($compoundValue[$metadatum_child2->get_id()]), 'Second element of value must be set' );
 		
-		$this->assertTrue( $compoundValue[$field_child1->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'First element of value should be an item metadata entity' );
-		$this->assertTrue( $compoundValue[$field_child2->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'Second element of value should be an item metadata entity' );
+		$this->assertTrue( $compoundValue[$metadatum_child1->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'First element of value should be an item metadata entity' );
+		$this->assertTrue( $compoundValue[$metadatum_child2->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'Second element of value should be an item metadata entity' );
 		
 		
-		$this->assertEquals( 'Red', $compoundValue[$field_child1->get_id()]->get_value() , 'First element of value should have "Red" value' );
-		$this->assertEquals( 'Blue', $compoundValue[$field_child2->get_id()]->get_value() , 'Second element of value should have "Blue" value' );
+		$this->assertEquals( 'Red', $compoundValue[$metadatum_child1->get_id()]->get_value() , 'First element of value should have "Red" value' );
+		$this->assertEquals( 'Blue', $compoundValue[$metadatum_child2->get_id()]->get_value() , 'Second element of value should have "Blue" value' );
 		
     }
 	
-	function test_multiple_compound_field_types() {
+	function test_multiple_compound_metadatum_types() {
 
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         
@@ -129,41 +129,41 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 		
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Compound',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Compound',
 				'status'	 => 'publish',
 				'multiple'   => 'yes'
 	        ),
 	        true
         );
         
-        $field_child1 = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum_child1 = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta2',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Text',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Text',
 				'status'	 => 'publish',
-				'parent' 	 => $field->get_id(),
+				'parent' 	 => $metadatum->get_id(),
 	        ),
 	        true
         );
 		
-		$field_child2 = $this->tainacan_entity_factory->create_entity(
-        	'field',
+		$metadatum_child2 = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta3',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Text',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Text',
 				'status'	 => 'publish',
-				'parent' 	 => $field->get_id(),
+				'parent' 	 => $metadatum->get_id(),
 	        ),
 	        true
         );
@@ -186,7 +186,7 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		
 		
 		// First Instance
-		$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($i, $field_child1);
+		$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_child1);
 		$item_metadata1->set_value('Red');
 		
 		$item_metadata1->validate();
@@ -194,7 +194,7 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		$item_metadata1 = $Tainacan_Item_Metadata->insert($item_metadata1);
 		
 		
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field_child2, null, $item_metadata1->get_parent_meta_id());
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_child2, null, $item_metadata1->get_parent_meta_id());
 		$item_metadata->set_value('Blue');
 		
 		$item_metadata->validate();
@@ -203,7 +203,7 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		
 		
 		// Second Instance
-		$item_metadata3 = new \Tainacan\Entities\Item_Metadata_Entity($i, $field_child1);
+		$item_metadata3 = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_child1);
 		$item_metadata3->set_value('Green');
 		
 		$item_metadata3->validate();
@@ -211,7 +211,7 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		$item_metadata3 = $Tainacan_Item_Metadata->insert($item_metadata3);
 		
 		
-		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field_child2, null, $item_metadata3->get_parent_meta_id());
+		$item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_child2, null, $item_metadata3->get_parent_meta_id());
 		$item_metadata->set_value('Yellow');
 		
 		$item_metadata->validate();
@@ -220,10 +220,10 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		
 		
 		
-		$compoundItem = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+		$compoundItem = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
 		
 		//var_dump($wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = {$i->get_id()}"));
-		//var_dump($wpdb->get_results("SELECT * FROM $wpdb->posts WHERE parent = {$field->get_id()}"));
+		//var_dump($wpdb->get_results("SELECT * FROM $wpdb->posts WHERE parent = {$metadatum->get_id()}"));
 		
 		$compoundValue = $compoundItem->get_value();
 		
@@ -233,24 +233,24 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 		$this->assertTrue( is_array($compoundValue[0]), 'value of a compound should return array' );
 		$this->assertTrue( is_array($compoundValue[1]), 'value of a compound should return array' );
 		
-		$this->assertTrue( isset($compoundValue[0][$field_child1->get_id()]), 'First element of value must be set' );
-		$this->assertTrue( isset($compoundValue[1][$field_child2->get_id()]), 'Second element of value must be set' );
+		$this->assertTrue( isset($compoundValue[0][$metadatum_child1->get_id()]), 'First element of value must be set' );
+		$this->assertTrue( isset($compoundValue[1][$metadatum_child2->get_id()]), 'Second element of value must be set' );
 		
-		$this->assertTrue( $compoundValue[0][$field_child1->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'First element of value should be an item metadata entity' );
-		$this->assertTrue( $compoundValue[1][$field_child2->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'Second element of value should be an item metadata entity' );
+		$this->assertTrue( $compoundValue[0][$metadatum_child1->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'First element of value should be an item metadata entity' );
+		$this->assertTrue( $compoundValue[1][$metadatum_child2->get_id()] instanceof \Tainacan\Entities\Item_Metadata_Entity , 'Second element of value should be an item metadata entity' );
 		
 		
-		$this->assertEquals( 'Red', $compoundValue[0][$field_child1->get_id()]->get_value() , 'First element of value should have "Red" value' );
-		$this->assertEquals( 'Blue', $compoundValue[0][$field_child2->get_id()]->get_value() , 'Second element of value should have "Blue" value' );
+		$this->assertEquals( 'Red', $compoundValue[0][$metadatum_child1->get_id()]->get_value() , 'First element of value should have "Red" value' );
+		$this->assertEquals( 'Blue', $compoundValue[0][$metadatum_child2->get_id()]->get_value() , 'Second element of value should have "Blue" value' );
 		
-		$this->assertEquals( 'Green', $compoundValue[1][$field_child1->get_id()]->get_value() , 'First element of value should have "Red" value' );
-		$this->assertEquals( 'Yellow', $compoundValue[1][$field_child2->get_id()]->get_value() , 'Second element of value should have "Blue" value' );
+		$this->assertEquals( 'Green', $compoundValue[1][$metadatum_child1->get_id()]->get_value() , 'First element of value should have "Red" value' );
+		$this->assertEquals( 'Yellow', $compoundValue[1][$metadatum_child2->get_id()]->get_value() , 'Second element of value should have "Blue" value' );
 		
     }
 	
 	function test_validations_category_in_multiple() {
 		
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 		
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
@@ -260,35 +260,35 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 		
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Compound',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Compound',
 				'status'	 => 'publish',
 				'multiple'   => 'yes'
 	        ),
 	        true
         );
 		
-		$newField = new \Tainacan\Entities\Field();
-		$newField->set_name('test_multiple');
-		$newField->set_field_type('Tainacan\Field_Types\Category');
-		$newField->set_parent($field->get_id());
+		$newMetadatum = new \Tainacan\Entities\Metadatum();
+		$newMetadatum->set_name('test_multiple');
+		$newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category');
+		$newMetadatum->set_parent($metadatum->get_id());
 		
-		$this->assertFalse($newField->validate(), 'You cant add a category field inside a multiple compound field');
+		$this->assertFalse($newMetadatum->validate(), 'You cant add a category metadatum inside a multiple compound metadatum');
 		
-		$newField->set_field_type('Tainacan\Field_Types\Text');
-		$this->assertTrue($newField->validate());
+		$newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text');
+		$this->assertTrue($newMetadatum->validate());
 		
 		
 	}
 	
 	function test_validations_category_in_multiple_2() {
 		
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 		
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
@@ -298,37 +298,37 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 		
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Compound',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Compound',
 				'status'	 => 'publish',
 				'multiple'   => 'no'
 	        ),
 	        true
         );
 		
-		$newField = new \Tainacan\Entities\Field();
-		$newField->set_name('test_multiple');
-		$newField->set_field_type('Tainacan\Field_Types\Category');
-		$newField->set_parent($field->get_id());
+		$newMetadatum = new \Tainacan\Entities\Metadatum();
+		$newMetadatum->set_name('test_multiple');
+		$newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category');
+		$newMetadatum->set_parent($metadatum->get_id());
 		
-		$this->assertTrue($newField->validate(), 'You can add a category field inside a not multiple compound field');
-		$newField = $Tainacan_Fields->insert($newField);
+		$this->assertTrue($newMetadatum->validate(), 'You can add a category metadatum inside a not multiple compound metadatum');
+		$newMetadatum = $Tainacan_Metadata->insert($newMetadatum);
 		
-		$field->set_multiple('yes');
+		$metadatum->set_multiple('yes');
 		
-		$this->assertFalse($field->validate(), 'You cant turn a compound field into multiple when there is a category field inside it');
+		$this->assertFalse($metadatum->validate(), 'You cant turn a compound metadatum into multiple when there is a category metadatum inside it');
 		
 		
 	}
 	
-	function test_validations_multiple_fields() {
+	function test_validations_multiple_metadata() {
 		
-		$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 		
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
@@ -338,30 +338,30 @@ class CompoundFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
 		
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'meta',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Compound',
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Compound',
 				'status'	 => 'publish',
 				'multiple'   => 'no'
 	        ),
 	        true
         );
 		
-		$newField = new \Tainacan\Entities\Field();
-		$newField->set_name('test_multiple');
-		$newField->set_multiple('yes');
-		$newField->set_field_type('Tainacan\Field_Types\Text');
-		$newField->set_parent($field->get_id());
+		$newMetadatum = new \Tainacan\Entities\Metadatum();
+		$newMetadatum->set_name('test_multiple');
+		$newMetadatum->set_multiple('yes');
+		$newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text');
+		$newMetadatum->set_parent($metadatum->get_id());
 		
-		$this->assertFalse($newField->validate(), 'You cant add a multiple field inside a compound field');
+		$this->assertFalse($newMetadatum->validate(), 'You cant add a multiple metadatum inside a compound metadatum');
 		
-		$newField->set_multiple('no');
+		$newMetadatum->set_multiple('no');
 		
-		$this->assertTrue($newField->validate());
+		$this->assertTrue($newMetadatum->validate());
 		
 		
 	}
diff --git a/tests/test-core-field-types.php b/tests/test-core-metadatum-types.php
similarity index 64%
rename from tests/test-core-field-types.php
rename to tests/test-core-metadatum-types.php
index ef2569a4b..eabd0f592 100644
--- a/tests/test-core-field-types.php
+++ b/tests/test-core-metadatum-types.php
@@ -13,10 +13,10 @@ use Tainacan\Entities;
 /**
  * Sample test case.
  */
-class CoreFieldTypes extends TAINACAN_UnitTestCase {
+class CoreMetadatumTypes extends TAINACAN_UnitTestCase {
 
 	
-    function test_core_field_types() {
+    function test_core_metadatum_types() {
 
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
@@ -29,24 +29,24 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
 			true
 		);
         
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'metadado',
 		        'description' => 'title',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Core_Title'
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Core_Title'
 	        ),
 	        true
         );
         
-        $fieldDescription = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatumDescription = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'metadado_desc',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Core_Description'
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Core_Description'
 	        ),
 	        true
         );
@@ -63,7 +63,7 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
        );
        
        
-       $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+       $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
        $item_metadata->set_value('changed title');
        $item_metadata->validate();
        
@@ -73,12 +73,12 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
        
        $this->assertEquals('changed title', $checkItem->get_title());
        
-       $check_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($checkItem, $field);
+       $check_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($checkItem, $metadatum);
        $this->assertEquals('changed title', $check_item_metadata->get_value());
        
        
        // description
-       $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $fieldDescription);
+       $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatumDescription);
        $item_metadata->set_value('changed description');
        $item_metadata->validate();
        
@@ -88,7 +88,7 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
        
        $this->assertEquals('changed description', $checkItem->get_description());
        
-       $check_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($checkItem, $fieldDescription);
+       $check_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($checkItem, $metadatumDescription);
        $this->assertEquals('changed description', $check_item_metadata->get_value());
        
     }
@@ -97,7 +97,7 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
 
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
             'collection',
@@ -117,11 +117,11 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
             true
         );
 
-        $fields = $Tainacan_Fields->fetch_by_collection( $collection, [], 'OBJECT' ) ;
+        $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [], 'OBJECT' ) ;
 
-        foreach ( $fields as $index => $field ){
-            if ( $field->get_field_type_object()->get_core() && $field->get_field_type_object()->get_related_mapped_prop() == 'title') {
-                $core_title = $field;
+        foreach ( $metadata as $index => $metadatum ){
+            if ( $metadatum->get_metadatum_type_object()->get_core() && $metadatum->get_metadatum_type_object()->get_related_mapped_prop() == 'title') {
+                $core_title = $metadatum;
             }
         }
 
@@ -134,7 +134,7 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
 
         $i->set_status('publish' );
 
-        $this->assertTrue($i->validate(), 'Item with empy title should validate because core title field has value');
+        $this->assertTrue($i->validate(), 'Item with empy title should validate because core title metadatum has value');
 
     }
 
@@ -142,7 +142,7 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
 
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
             'collection',
@@ -152,14 +152,14 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
             true
         );
 
-        $fields = $Tainacan_Fields->fetch_by_collection( $collection, [], 'OBJECT' ) ;
+        $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [], 'OBJECT' ) ;
 
-        foreach ( $fields as $index => $field ){
-            if ( $field->get_field_type_object()->get_core() && $field->get_field_type_object()->get_related_mapped_prop() == 'title') {
-                $core_title = $field;
+        foreach ( $metadata as $index => $metadatum ){
+            if ( $metadatum->get_metadatum_type_object()->get_core() && $metadatum->get_metadatum_type_object()->get_related_mapped_prop() == 'title') {
+                $core_title = $metadatum;
             }
-            if ( $field->get_field_type_object()->get_core() && $field->get_field_type_object()->get_related_mapped_prop() == 'description') {
-                $core_description = $field;
+            if ( $metadatum->get_metadatum_type_object()->get_core() && $metadatum->get_metadatum_type_object()->get_related_mapped_prop() == 'description') {
+                $core_description = $metadatum;
             }
         }
 
@@ -183,31 +183,31 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase {
 			true
         );
 
-        $fieldDescription = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatumDescription = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'just to confuse',
 		        'description' => 'description',
 		        'collection' => $collection,
-		        'field_type' => 'Tainacan\Field_Types\Text'
+		        'metadatum_type' => 'Tainacan\Metadatum_Types\Text'
 	        ),
 	        true
         );
         
-        $core_fields = $collection->get_core_fields();
+        $core_metadata = $collection->get_core_metadata();
 
-        $this->assertEquals(2, sizeof($core_fields));
+        $this->assertEquals(2, sizeof($core_metadata));
 
-        $this->assertNotEquals('Tainacan\Field_Types\Text', $core_fields[0]->get_field_type());
-        $this->assertNotEquals('Tainacan\Field_Types\Text', $core_fields[1]->get_field_type());
+        $this->assertNotEquals('Tainacan\Metadatum_Types\Text', $core_metadata[0]->get_metadatum_type());
+        $this->assertNotEquals('Tainacan\Metadatum_Types\Text', $core_metadata[1]->get_metadatum_type());
 
-        $title = $collection->get_core_title_field();
+        $title = $collection->get_core_title_metadatum();
 
-        $this->assertEquals('Tainacan\Field_Types\Core_Title', $title->get_field_type());
+        $this->assertEquals('Tainacan\Metadatum_Types\Core_Title', $title->get_metadatum_type());
 
-        $description = $collection->get_core_description_field();
+        $description = $collection->get_core_description_metadatum();
 
-        $this->assertEquals('Tainacan\Field_Types\Core_Description', $description->get_field_type());
+        $this->assertEquals('Tainacan\Metadatum_Types\Core_Description', $description->get_metadatum_type());
 
 
     }
diff --git a/tests/test-filters.php b/tests/test-filters.php
index 2987c92c7..78649676c 100644
--- a/tests/test-filters.php
+++ b/tests/test-filters.php
@@ -54,12 +54,12 @@ class Filters extends TAINACAN_UnitTestCase {
 	        true
         );
 
-	    $field = $this->tainacan_entity_factory->create_entity(
-	    	'field',
+	    $metadatum = $this->tainacan_entity_factory->create_entity(
+	    	'metadatum',
 		    array(
 		    	'name'              => 'metadado',
 			    'collection_id'     => $collection->get_id(),
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		    	'description' => 'descricao',
 		    ),
 		    true
@@ -73,7 +73,7 @@ class Filters extends TAINACAN_UnitTestCase {
 		    	'name'               => 'filtro',
 			    'collection'         => $collection,
 		    	'description' => 'descricao',
-			    'field'           => $field,
+			    'metadatum'           => $metadatum,
 			    'filter_type' => $filter_list_type
 		    ),
 		    true
@@ -88,7 +88,7 @@ class Filters extends TAINACAN_UnitTestCase {
 
         $this->assertEquals( 'filtro', $test->get_name() );
         $this->assertEquals( $collection->get_id(), $test->get_collection_id() );
-        $this->assertEquals( $field->get_id(), $test->get_field()->get_id() );
+        $this->assertEquals( $metadatum->get_id(), $test->get_metadatum()->get_id() );
         $objClass = get_class( $filter_list_type );
         $storedObjClass = get_class( $test->get_filter_type_object() );
         $this->assertEquals($objClass , $storedObjClass );
@@ -120,12 +120,12 @@ class Filters extends TAINACAN_UnitTestCase {
             true
         );
 
-        $field2 = $this->tainacan_entity_factory->create_entity(
-            'field',
+        $metadatum2 = $this->tainacan_entity_factory->create_entity(
+            'metadatum',
             array(
                 'name'          => 'Other filtered',
                 'description'   => 'Is filtered',
-                'field_type'    => 'Tainacan\Field_Types\Text',
+                'metadatum_type'    => 'Tainacan\Metadatum_Types\Text',
                 'collection_id' => $collection->get_id()
             ),
             true
@@ -139,7 +139,7 @@ class Filters extends TAINACAN_UnitTestCase {
 		        'name'        => 'filtro',
 		        'collection'  => $collection,
 		        'description' => 'descricao',
-		        'field'       => $field2,
+		        'metadatum'       => $metadatum2,
 		        'filter_type' => $autocomplete
 	        ),
             true
@@ -155,10 +155,10 @@ class Filters extends TAINACAN_UnitTestCase {
         $filter2->set_name('filter 2');
         $filter2->set_collection($collection);
         $filter2->set_description('description');
-        $filter2->set_field($field2);
+        $filter2->set_metadatum($metadatum2);
         $filter2->set_filter_type($custom_interval);
 
-        $this->assertFalse($filter2->validate(), 'filter with a field with unsupported primitive type should not validate');
+        $this->assertFalse($filter2->validate(), 'filter with a metadatum with unsupported primitive type should not validate');
 
     }
 }
\ No newline at end of file
diff --git a/tests/test-importer.php b/tests/test-importer.php
index 0fa8445bd..123f945b8 100644
--- a/tests/test-importer.php
+++ b/tests/test-importer.php
@@ -33,7 +33,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
     public function test_automapping_old_tainacan()
     {
         //$Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
-        //$Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        //$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $old_tainacan = new Importer\Old_Tainacan();
         $id = $old_tainacan->get_id();
@@ -65,7 +65,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 
     /*public function test_file_old_tainacan () {
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $old_tainacan = new Importer\Old_Tainacan();
         $id = $old_tainacan->get_id();
@@ -89,8 +89,8 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 
         $this->assertEquals( 5, $_SESSION['tainacan_importer'][$id]->get_total_items() );
 
-        // get fields to mapping
-        $headers =  $_SESSION['tainacan_importer'][$id]->get_fields();
+        // get metadata to mapping
+        $headers =  $_SESSION['tainacan_importer'][$id]->get_metadata();
         $this->assertEquals( $headers[5], 'post_title' );
 
         // inserting the collection
@@ -108,13 +108,13 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         // set the importer
         $_SESSION['tainacan_importer'][$id]->set_collection( $collection );
 
-        // get collection fields to map
-        $fields = $Tainacan_Fields->fetch_by_collection( $collection, [], 'OBJECT' ) ;
+        // get collection metadata to map
+        $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [], 'OBJECT' ) ;
 
         //create a random mapping
         $map = [];
-        foreach ( $fields as $index => $field ){
-            $map[$field->get_id()] = $headers[$index];
+        foreach ( $metadata as $index => $metadatum ){
+            $map[$metadatum->get_id()] = $headers[$index];
         }
 
         // set the mapping
@@ -141,7 +141,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
      */
     public function test_file_csv () {
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $file_name = 'demosaved.csv';
         $csv_importer = new Importer\CSV();
         $id = $csv_importer->get_id();
@@ -177,8 +177,8 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         // count size of csv
         $this->assertEquals( 5, $_SESSION['tainacan_importer'][$id]->get_progress_total_from_source() );
 
-        // get fields to mapping
-        $headers =  $_SESSION['tainacan_importer'][$id]->get_source_fields();
+        // get metadata to mapping
+        $headers =  $_SESSION['tainacan_importer'][$id]->get_source_metadata();
         $this->assertEquals( $headers[4], 'Column 5' );
 
         // inserting the collection
@@ -198,13 +198,13 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 			'total_items' => $_SESSION['tainacan_importer'][$id]->get_progress_total_from_source(),
 		];
 		
-        // get collection fields to map
-        $fields = $Tainacan_Fields->fetch_by_collection( $collection, [], 'OBJECT' ) ;
+        // get collection metadata to map
+        $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [], 'OBJECT' ) ;
 
         //create a random mapping
         $map = [];
-        foreach ( $fields as $index => $field ){
-            $map[$field->get_id()] = $headers[$index];
+        foreach ( $metadata as $index => $metadatum ){
+            $map[$metadatum->get_id()] = $headers[$index];
         }
 		
 		$collection_definition['map'] = $map;
diff --git a/tests/test-item-metadata.php b/tests/test-item-metadata.php
index efea68076..57f40a19c 100644
--- a/tests/test-item-metadata.php
+++ b/tests/test-item-metadata.php
@@ -18,7 +18,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
      */
     function test_add() {
 
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
@@ -30,18 +30,18 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 	        true
         );
 
-	    $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+	    $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name'              => 'metadado',
 		        'description'       => 'descricao',
 		        'collection'        => $collection,
-		        'field_type'  => 'Tainacan\Field_Types\Text',
+		        'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 	        ),
 	        true
         );
 
-        $test = $Tainacan_Fields->fetch($field->get_id());
+        $test = $Tainacan_Metadata->fetch($metadatum->get_id());
         
         $i = $this->tainacan_entity_factory->create_entity(
         	'item',
@@ -71,7 +71,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
      * Teste da insercao de um metadado simples com o tipo
      */
     function teste_required(){
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
@@ -83,19 +83,19 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 	        true
         );
 
-	    $field = $this->tainacan_entity_factory->create_entity(
-	    	'field',
+	    $metadatum = $this->tainacan_entity_factory->create_entity(
+	    	'metadatum',
 		    array(
 		    	'name'              => 'metadado',
 			    'description'       => 'descricao',
 			    'collection'        => $collection,
 			    'required'          => 'yes',
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		    ),
 		    true
 	    );
 
-        $test = $Tainacan_Fields->fetch($field->get_id());
+        $test = $Tainacan_Metadata->fetch($metadatum->get_id());
         
         $i = $this->tainacan_entity_factory->create_entity(
         	'item',
@@ -125,7 +125,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
     }
     
     function teste_collection_key(){
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
@@ -137,14 +137,14 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 	        true
         );
 
-	    $field = $this->tainacan_entity_factory->create_entity(
-		    'field',
+	    $metadatum = $this->tainacan_entity_factory->create_entity(
+		    'metadatum',
 		    array(
 			    'name'              => 'metadado',
 			    'description'       => 'descricao',
 			    'collection'        => $collection,
 			    'collection_key'    => 'yes',
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		    ),
 		    true
 	    );
@@ -175,7 +175,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 
         $value = 'teste_val';
         
-        $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+        $item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
         $item_metadata->set_value($value);
 
         $this->assertTrue($item_metadata->validate());
@@ -183,11 +183,11 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
         $item_metadata->validate();
         $item_metadata = $Tainacan_Item_Metadata->insert($item_metadata);
 
-        $n_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $field);
+        $n_item_metadata = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum);
         $n_item_metadata->set_value($value);
 		$this->assertTrue($n_item_metadata->validate(), 'trying to validate the same item with same value should be ok');
 
-		$n_item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($i2, $field);
+		$n_item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($i2, $metadatum);
 		$n_item_metadata2->set_value($value);
 		$this->assertFalse($n_item_metadata2->validate(), 'Collection key should not validate another item metadatada with the same value');
     }
@@ -206,18 +206,18 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 
 
         $this->tainacan_entity_factory->create_entity(
-        	'field',
+        	'metadatum',
             array(
             	'name'              => 'metadado',
 	            'description'       => 'descricao',
 	            'collection'        => $collection,
 	            'status'            => 'publish',
-	            'field_type'  => 'Tainacan\Field_Types\Text',
+	            'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
             ),
 	        true
         );
 
-        //$test = $Tainacan_Fields->fetch($field->get_id());
+        //$test = $Tainacan_Metadata->fetch($metadatum->get_id());
         
         $i = $this->tainacan_entity_factory->create_entity(
         	'item',
@@ -233,14 +233,14 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 
         $names = [];
         foreach ($item_metadatas as $item_metadata) {
-            $names[] = $item_metadata->get_field()->get_name();
+            $names[] = $item_metadata->get_metadatum()->get_name();
         }
         
         $this->assertTrue(is_array($item_metadatas));
 
-        // notice for repository fields
+        // notice for repository metadata
         $this->assertEquals(3, sizeof($item_metadatas));
-        //first 2 fields are repository fields
+        //first 2 metadata are repository metadata
         $this->assertTrue( in_array('metadado', $names) );
         
     }
diff --git a/tests/test-items.php b/tests/test-items.php
index 9aeaf37fc..42bb04c63 100644
--- a/tests/test-items.php
+++ b/tests/test-items.php
@@ -92,35 +92,35 @@ class Items extends TAINACAN_UnitTestCase {
 		    true
 	    );
 
-	    $field = $this->tainacan_entity_factory->create_entity(
-		    'field',
+	    $metadatum = $this->tainacan_entity_factory->create_entity(
+		    'metadatum',
 		    array(
 			    'name'   => 'metadado',
 			    'status' => 'publish',
 			    'collection' => $collection,
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		    ),
 		    true
 	    );
 
-	    $field2 = $this->tainacan_entity_factory->create_entity(
-		    'field',
+	    $metadatum2 = $this->tainacan_entity_factory->create_entity(
+		    'metadatum',
 		    array(
 			    'name'   => 'metadado2',
 			    'status' => 'publish',
 			    'collection' => $collection,
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		    ),
 		    true
 	    );
 
-	    $field3 = $this->tainacan_entity_factory->create_entity(
-		    'field',
+	    $metadatum3 = $this->tainacan_entity_factory->create_entity(
+		    'metadatum',
 		    array(
 			    'name'              => 'metadado3',
 			    'status'            => 'publish',
 			    'collection'        => $collection,
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		    ),
 		    true
 	    );
@@ -137,12 +137,12 @@ class Items extends TAINACAN_UnitTestCase {
 	        true
         );
         
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field, 'value_1');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum, 'value_1');
         
         $item = $Tainacan_Items->fetch($i->get_id());
-        $meta_test = new Entities\Item_Metadata_Entity($item, $field);
+        $meta_test = new Entities\Item_Metadata_Entity($item, $metadatum);
         $this->assertTrue( $meta_test instanceof Entities\Item_Metadata_Entity );
-        $this->assertEquals( $field->get_id(), $meta_test->get_field()->get_id() );
+        $this->assertEquals( $metadatum->get_id(), $meta_test->get_metadatum()->get_id() );
         $this->assertEquals( 'value_1', $meta_test->get_value());
 
 	    $i = $this->tainacan_entity_factory->create_entity(
@@ -155,7 +155,7 @@ class Items extends TAINACAN_UnitTestCase {
 		    true
 	    );
         
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field3, 'value_2');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum3, 'value_2');
         
 	    $i = $this->tainacan_entity_factory->create_entity(
 		    'item',
@@ -167,9 +167,9 @@ class Items extends TAINACAN_UnitTestCase {
 		    true
 	    );
         
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field2, 'value_2');
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field2, 'value_3');
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field3, 'value_3');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum2, 'value_2');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum2, 'value_3');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum3, 'value_3');
 
 	    $i = $this->tainacan_entity_factory->create_entity(
 		    'item',
@@ -181,8 +181,8 @@ class Items extends TAINACAN_UnitTestCase {
 		    true
 	    );
         
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field2, 'value_3');
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field3, 'value_6');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum2, 'value_3');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum3, 'value_6');
 
         // should return all 4 items
         $test_query = $Tainacan_Items->fetch([]);
@@ -226,7 +226,7 @@ class Items extends TAINACAN_UnitTestCase {
         $test_query = $Tainacan_Items->fetch([
             'meta_query' => [
                 [
-                    'key' => $field2->get_id(),
+                    'key' => $metadatum2->get_id(),
                     'value' => 'value_3'
                 ]
             ]
@@ -237,7 +237,7 @@ class Items extends TAINACAN_UnitTestCase {
         $test_query = $Tainacan_Items->fetch([
             'meta_query' => [
                 [
-                    'key' => $field2->get_id(),
+                    'key' => $metadatum2->get_id(),
                     'value' => 'value_3'
                 ]
             ]
@@ -248,7 +248,7 @@ class Items extends TAINACAN_UnitTestCase {
         $test_query = $Tainacan_Items->fetch([
             'meta_query' => [
                 [
-                    'key' => $field3->get_id(),
+                    'key' => $metadatum3->get_id(),
                     'value' => 'value_2',
                     'compare' => '>'
                 ]
diff --git a/tests/test-fields.php b/tests/test-metadata.php
similarity index 50%
rename from tests/test-fields.php
rename to tests/test-metadata.php
index 2ed453545..23d26ddab 100644
--- a/tests/test-fields.php
+++ b/tests/test-metadata.php
@@ -1,24 +1,24 @@
 <?php
 
 namespace Tainacan\Tests;
-use Tainacan\Field_Types;
+use Tainacan\Metadatum_Types;
 /**
- * Class Field
+ * Class Metadatum
  *
  * @package Test_Tainacan
  */
 
 /**
- * Field test case.
- * @group fields
+ * Metadatum test case.
+ * @group metadata
  */
-class Fields extends TAINACAN_UnitTestCase {
+class Metadata extends TAINACAN_UnitTestCase {
 
     /**
-     * Test insert a regular field with type
+     * Test insert a regular metadatum with type
      */
     function test_add() {
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
         	'collection',
@@ -28,19 +28,19 @@ class Fields extends TAINACAN_UnitTestCase {
 	        true
         );
 
-        $field = $this->tainacan_entity_factory->create_entity(
-        	'field',
+        $metadatum = $this->tainacan_entity_factory->create_entity(
+        	'metadatum',
 	        array(
 	        	'name' => 'metadado',
 		        'description' => 'descricao',
 		        'collection' => $collection,
 	        	'accept_suggestion' => true,
-		        'field_type'  => 'Tainacan\Field_Types\Text',
+		        'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 	        ),
 	        true
         );
 
-        $test = $Tainacan_Fields->fetch($field->get_id());
+        $test = $Tainacan_Metadata->fetch($metadatum->get_id());
 
         $this->assertEquals($test->get_name(), 'metadado');
         $this->assertEquals($test->get_description(), 'descricao');
@@ -49,10 +49,10 @@ class Fields extends TAINACAN_UnitTestCase {
     }
 
     /**
-     * Test insert a regular field with type
+     * Test insert a regular metadatum with type
      */
     function test_add_type(){
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
 	        'collection',
@@ -62,37 +62,37 @@ class Fields extends TAINACAN_UnitTestCase {
 	        true
         );
 
-	    $field = $this->tainacan_entity_factory->create_entity(
-	        'field',
+	    $metadatum = $this->tainacan_entity_factory->create_entity(
+	        'metadatum',
 	        array(
 		        'name'              => 'metadado',
 		        'description'       => 'descricao',
 		        'collection_id'     => $collection->get_id(),
-		        'field_type'  => 'Tainacan\Field_Types\Text',
+		        'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 	        ),
 	        true
         );
 
-        $test = $Tainacan_Fields->fetch($field->get_id());
+        $test = $Tainacan_Metadata->fetch($metadatum->get_id());
 
         $this->assertEquals($test->get_name(), 'metadado');
         $this->assertEquals($test->get_collection_id(), $collection->get_id());
-        $this->assertEquals('Tainacan\Field_Types\Text', $test->get_field_type());
-        $this->assertEquals($test->get_field_type(), 'Tainacan\Field_Types\Text');
+        $this->assertEquals('Tainacan\Metadatum_Types\Text', $test->get_metadatum_type());
+        $this->assertEquals($test->get_metadatum_type(), 'Tainacan\Metadatum_Types\Text');
     }
 
     /**
-     * test if parent field are visible for children collection
+     * test if parent metadatum are visible for children collection
      */
     function test_hierarchy_metadata(){
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
 	    $this->tainacan_entity_factory->create_entity(
-        	'field',
+        	'metadatum',
 	        array(
-	        	'name'              => 'field default',
-		        'collection_id'     => $Tainacan_Fields->get_default_metadata_attribute(),
-		        'field_type'  => 'Tainacan\Field_Types\Text',
+	        	'name'              => 'metadatum default',
+		        'collection_id'     => $Tainacan_Metadata->get_default_metadata_attribute(),
+		        'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		        'status'            => 'publish'
 	        ),
 	        true
@@ -107,11 +107,11 @@ class Fields extends TAINACAN_UnitTestCase {
         );
 
         $this->tainacan_entity_factory->create_entity(
-        	'field',
+        	'metadatum',
 	        array(
-	        	'name'              => 'field grandfather',
+	        	'name'              => 'metadatum grandfather',
 		        'collection_id'     => $collection_grandfather->get_id(),
-		        'field_type'  => 'Tainacan\Field_Types\Text',
+		        'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 		        'status'            => 'publish'
 	        ),
 	        true
@@ -127,11 +127,11 @@ class Fields extends TAINACAN_UnitTestCase {
 	    );
 
 	    $this->tainacan_entity_factory->create_entity(
-		    'field',
+		    'metadatum',
 		    array(
-			    'name'              => 'field father',
+			    'name'              => 'metadatum father',
 			    'collection_id'     => $collection_father->get_id(),
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			    'status'            => 'publish'
 		    ),
 		    true
@@ -150,41 +150,41 @@ class Fields extends TAINACAN_UnitTestCase {
         $this->assertEquals( $collection_father->get_id(), $collection_son->get_parent() );
 
 	    $this->tainacan_entity_factory->create_entity(
-		    'field',
+		    'metadatum',
 		    array(
-			    'name'              => 'field son',
+			    'name'              => 'metadatum son',
 			    'collection_id'     => $collection_son->get_id(),
-			    'field_type'  => 'Tainacan\Field_Types\Text',
+			    'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			    'status'            => 'publish'
 		    ),
 		    true
 	    );
 
-        $retrieve_metadata =  $Tainacan_Fields->fetch_by_collection( $collection_son, [], 'OBJECT' );
+        $retrieve_metadata =  $Tainacan_Metadata->fetch_by_collection( $collection_son, [], 'OBJECT' );
 
         // should return 6
         $this->assertEquals( 6, sizeof( $retrieve_metadata ) );
     }
 
     /**
-     * test remove core fields
+     * test remove core metadata
      */
-    function test_core_fields(){
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+    function test_core_metadata(){
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection_grandfather = $this->tainacan_entity_factory->create_entity(
             'collection',
             array(
-                'name' => 'collection field'
+                'name' => 'collection metadatum'
             ),
             true
         );
 
-        $core_fields = $Tainacan_Fields->get_core_fields( $collection_grandfather );
+        $core_metadata = $Tainacan_Metadata->get_core_metadata( $collection_grandfather );
 
-        if( $core_fields ){
-            foreach( $core_fields as $core_field ){
-                $this->assertFalse(wp_trash_post( $core_field->get_id() ) );
+        if( $core_metadata ){
+            foreach( $core_metadata as $core_metadatum ){
+                $this->assertFalse(wp_trash_post( $core_metadatum->get_id() ) );
             }
         }
     }
@@ -192,18 +192,18 @@ class Fields extends TAINACAN_UnitTestCase {
     /**
      * test if the defaults types are registered
      */
-    function test_metadata_field_type(){
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
-        $this->assertEquals( 8, sizeof( $Tainacan_Fields->fetch_field_types() ) );
+    function test_metadata_metadatum_type(){
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+        $this->assertEquals( 8, sizeof( $Tainacan_Metadata->fetch_metadatum_types() ) );
     }
 
 
     /**
      *
      */
-    function test_ordenation_fields(){
+    function test_ordenation_metadata(){
         $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
             'collection',
@@ -213,84 +213,84 @@ class Fields extends TAINACAN_UnitTestCase {
             true
         );
 
-        $field1 = $this->tainacan_entity_factory->create_entity(
-            'field',
+        $metadatum1 = $this->tainacan_entity_factory->create_entity(
+            'metadatum',
             array(
-                'name' => 'field1',
+                'name' => 'metadatum1',
                 'description' => 'descricao',
                 'collection' => $collection,
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
                 'status' => 'publish'
             ),
             true
         );
 
-        $field2 = $this->tainacan_entity_factory->create_entity(
-            'field',
+        $metadatum2 = $this->tainacan_entity_factory->create_entity(
+            'metadatum',
             array(
-                'name' => 'field2',
-                'description' => 'field2',
+                'name' => 'metadatum2',
+                'description' => 'metadatum2',
                 'collection' => $collection,
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
                 'status' => 'publish'
             ),
             true
         );
 
 
-        $field3 = $this->tainacan_entity_factory->create_entity(
-            'field',
+        $metadatum3 = $this->tainacan_entity_factory->create_entity(
+            'metadatum',
             array(
-                'name' => 'field3',
-                'description' => 'field3',
+                'name' => 'metadatum3',
+                'description' => 'metadatum3',
                 'collection' => $collection,
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
                 'status' => 'publish'
             ),
             true
         );
 
-        $collection->set_fields_order(
+        $collection->set_metadata_order(
             [
-                array( 'id' => $field3->get_id(), 'enabled' => false ),
-                array( 'id' => $field2->get_id(), 'enabled' => true ),
-                array( 'id' => $field1->get_id(), 'enabled' => true )
+                array( 'id' => $metadatum3->get_id(), 'enabled' => false ),
+                array( 'id' => $metadatum2->get_id(), 'enabled' => true ),
+                array( 'id' => $metadatum1->get_id(), 'enabled' => true )
             ]);
 
         $update_collection = $Tainacan_Collections->update( $collection );
         
-        $fields_ordinate = $Tainacan_Fields->fetch_by_collection( $update_collection, [], 'OBJECT' );
-        $this->assertEquals( 'field2', $fields_ordinate[0]->get_name() );
+        $metadata_ordinate = $Tainacan_Metadata->fetch_by_collection( $update_collection, [], 'OBJECT' );
+        $this->assertEquals( 'metadatum2', $metadata_ordinate[0]->get_name() );
 
-        $fields_ordinate_enabled = $Tainacan_Fields->fetch_by_collection( $update_collection, [ 'include_disabled' => true ], 'OBJECT' );
-        $this->assertEquals( 'field3', $fields_ordinate_enabled[0]->get_name() );
+        $metadata_ordinate_enabled = $Tainacan_Metadata->fetch_by_collection( $update_collection, [ 'include_disabled' => true ], 'OBJECT' );
+        $this->assertEquals( 'metadatum3', $metadata_ordinate_enabled[0]->get_name() );
 		
-		$this->assertFalse($fields_ordinate_enabled[0]->get_enabled_for_collection());
-		$this->assertTrue($fields_ordinate_enabled[1]->get_enabled_for_collection());
-		$this->assertTrue($fields_ordinate_enabled[2]->get_enabled_for_collection());
+		$this->assertFalse($metadata_ordinate_enabled[0]->get_enabled_for_collection());
+		$this->assertTrue($metadata_ordinate_enabled[1]->get_enabled_for_collection());
+		$this->assertTrue($metadata_ordinate_enabled[2]->get_enabled_for_collection());
     }
     
     function test_unique_slugs() {
 		$x = $this->tainacan_entity_factory->create_entity(
-			'field',
+			'metadatum',
 			array(
 				'name'          => 'teste',
 				'description'   => 'adasdasdsa',
                 'slug'          => 'duplicated_slug',
                 'status'        => 'publish',
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			),
 			true
 		);
         
         $y = $this->tainacan_entity_factory->create_entity(
-			'field',
+			'metadatum',
 			array(
 				'name'          => 'teste',
 				'description'   => 'adasdasdsa',
                 'slug'          => 'duplicated_slug',
                 'status'        => 'publish',
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			),
 			true
 		);
@@ -299,43 +299,43 @@ class Fields extends TAINACAN_UnitTestCase {
         
         // Create as draft and publish later
         $x = $this->tainacan_entity_factory->create_entity(
-			'field',
+			'metadatum',
 			array(
 				'name'          => 'teste',
 				'description'   => 'adasdasdsa',
                 'slug'          => 'duplicated_slug',
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			),
 			true
 		);
         
         $y = $this->tainacan_entity_factory->create_entity(
-			'field',
+			'metadatum',
 			array(
 				'name'          => 'teste',
 				'description'   => 'adasdasdsa',
                 'slug'          => 'duplicated_slug',
-                'field_type'  => 'Tainacan\Field_Types\Text',
+                'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 			),
 			true
 		);
         
         $this->assertEquals($x->get_slug(), $y->get_slug());
         
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $x->set_status('publish');
         $x->validate();
-        $x = $Tainacan_Fields->insert($x);
+        $x = $Tainacan_Metadata->insert($x);
         $y->set_status('private'); // or publish shoud behave the same
         $y->validate();
-        $y = $Tainacan_Fields->insert($y);
+        $y = $Tainacan_Metadata->insert($y);
         
         $this->assertNotEquals($x->get_slug(), $y->get_slug());
         
     }
 
-    function test_validation_of_field_types() {
-        $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance();
+    function test_validation_of_metadatum_types() {
+        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 
         $collection = $this->tainacan_entity_factory->create_entity(
         	'collection',
@@ -346,41 +346,41 @@ class Fields extends TAINACAN_UnitTestCase {
         );
 
         
-        $validField = new \Tainacan\Entities\Field();
-        $validField->set_name('test');
-        $validField->set_description('test');
-        $validField->set_collection($collection);
-        $validField->set_field_type('Tainacan\Field_Types\Relationship');
-        $validField->set_field_type_options(['collection_id' => 12]);
+        $validMetadatum = new \Tainacan\Entities\Metadatum();
+        $validMetadatum->set_name('test');
+        $validMetadatum->set_description('test');
+        $validMetadatum->set_collection($collection);
+        $validMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Relationship');
+        $validMetadatum->set_metadatum_type_options(['collection_id' => 12]);
         
-        $this->assertTrue($validField->validate());
+        $this->assertTrue($validMetadatum->validate());
         
-        $invalidField = new \Tainacan\Entities\Field();
-        $invalidField->set_name('test');
-        $invalidField->set_description('test');
-        $invalidField->set_collection($collection);
-        $invalidField->set_status('publish');
-        $invalidField->set_field_type('Tainacan\Field_Types\Relationship');
-        $invalidField->set_field_type_options(['collection_id' => 'string']);
+        $invalidMetadatum = new \Tainacan\Entities\Metadatum();
+        $invalidMetadatum->set_name('test');
+        $invalidMetadatum->set_description('test');
+        $invalidMetadatum->set_collection($collection);
+        $invalidMetadatum->set_status('publish');
+        $invalidMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Relationship');
+        $invalidMetadatum->set_metadatum_type_options(['collection_id' => 'string']);
         
-        $this->assertFalse($invalidField->validate());
+        $this->assertFalse($invalidMetadatum->validate());
 
     }
 }
 
 /**
- * Class TainacanFieldType
+ * Class TainacanMetadatumType
  */
-class RandomType extends Field_Types\Field_Type {
+class RandomType extends Metadatum_Types\Metadatum_Type {
 
     function __construct(){
         parent::__construct();
     }
 
     /**
-     * @param $field
+     * @param $metadatum
      * @return string
      */
 
-    public function render( $field ){}
+    public function render( $metadatum ){}
 }
\ No newline at end of file
diff --git a/tests/test-objects.php b/tests/test-objects.php
index c0efc3a0e..de7bc8eaa 100644
--- a/tests/test-objects.php
+++ b/tests/test-objects.php
@@ -45,35 +45,35 @@ class Objects extends TAINACAN_UnitTestCase {
 				true
 				);
 		
-		$field = $this->tainacan_entity_factory->create_entity(
-				'field',
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+				'metadatum',
 				array(
 					'name'   => 'metadado',
 					'status' => 'publish',
 					'collection' => $collection,
-					'field_type'  => 'Tainacan\Field_Types\Text',
+					'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 				),
 				true
 				);
 		
-		$field2 = $this->tainacan_entity_factory->create_entity(
-				'field',
+		$metadatum2 = $this->tainacan_entity_factory->create_entity(
+				'metadatum',
 				array(
 					'name'   => 'metadado2',
 					'status' => 'publish',
 					'collection' => $collection,
-					'field_type'  => 'Tainacan\Field_Types\Text',
+					'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 				),
 				true
 				);
 		
-		$field3 = $this->tainacan_entity_factory->create_entity(
-				'field',
+		$metadatum3 = $this->tainacan_entity_factory->create_entity(
+				'metadatum',
 				array(
 					'name'              => 'metadado3',
 					'status'            => 'publish',
 					'collection'        => $collection,
-					'field_type'  => 'Tainacan\Field_Types\Text',
+					'metadatum_type'  => 'Tainacan\Metadatum_Types\Text',
 				),
 				true
 				);
@@ -89,25 +89,25 @@ class Objects extends TAINACAN_UnitTestCase {
 				true
 				);
 		
-        $this->tainacan_item_metadata_factory->create_item_metadata($i, $field, 'value_1');
+        $this->tainacan_item_metadata_factory->create_item_metadata($i, $metadatum, 'value_1');
         
         $test = get_post($i->get_id());
 		$entity = Repository::get_entity_by_post($test);
 		$this->assertEquals($i->get_db_identifier(), $entity->get_db_identifier());
 		
-		$test = get_post($field->get_id());
+		$test = get_post($metadatum->get_id());
 		$entity = Repository::get_entity_by_post($test);
-		$this->assertEquals($field->get_db_identifier(), $entity->get_db_identifier());
+		$this->assertEquals($metadatum->get_db_identifier(), $entity->get_db_identifier());
 		
-		$test = get_post($field2->get_id());
+		$test = get_post($metadatum2->get_id());
 		$entity = Repository::get_entity_by_post($test);
-		$this->assertEquals($field2->get_db_identifier(), $entity->get_db_identifier());
+		$this->assertEquals($metadatum2->get_db_identifier(), $entity->get_db_identifier());
 		
-		$fields = $i->get_fields();
-		$item_metadata = array_pop($fields);
-		$test = get_post($item_metadata->get_field()->get_id());
+		$metadata = $i->get_metadata();
+		$item_metadata = array_pop($metadata);
+		$test = get_post($item_metadata->get_metadatum()->get_id());
 		$entity = Repository::get_entity_by_post($test);
-		$this->assertEquals($item_metadata->get_field()->get_db_identifier(), $entity->get_db_identifier());
+		$this->assertEquals($item_metadata->get_metadatum()->get_db_identifier(), $entity->get_db_identifier());
 	}
     
     function test_delete_attributes() {