diff --git a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
index 8048c96..4d057d6 100644
--- a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
+++ b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/data/mysql-schema.sql b/data/mysql-schema.sql
deleted file mode 100644
index d781ab5..0000000
--- a/data/mysql-schema.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-CREATE TABLE IF NOT EXISTS `field` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(255) NOT NULL,
-  `value` TEXT NULL,
-  `label` VARCHAR(255) NOT NULL,
-  PRIMARY KEY (`id`))
-  ENGINE = InnoDB;
-
-CREATE TABLE IF NOT EXISTS `option` (
-  `id` INT NOT NULL,
-  `option` TEXT NULL,
-  `field_id` INT NOT NULL,
-  PRIMARY KEY (`id`),
-  INDEX `fk_options_field_idx` (`field_id` ASC),
-  CONSTRAINT `fk_options_field`
-  FOREIGN KEY (`field_id`)
-  REFERENCES `field` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-  ENGINE = InnoDB;
-
-CREATE TABLE IF NOT EXISTS `collection` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(255) NOT NULL,
-  `label` VARCHAR(255) NOT NULL,
-  PRIMARY KEY (`id`))
-  ENGINE = InnoDB;
-
-CREATE TABLE IF NOT EXISTS `collectionfield` (
-  `collection_id` INT NOT NULL,
-  `field_id` INT NOT NULL,
-  `id` INT NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`, `collection_id`, `field_id`),
-  INDEX `fk_collection_has_field_field1_idx` (`field_id` ASC),
-  INDEX `fk_collection_has_field_collection1_idx` (`collection_id` ASC),
-  CONSTRAINT `fk_collection_has_field_collection1`
-  FOREIGN KEY (`collection_id`)
-  REFERENCES `collection` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_collection_has_field_field1`
-  FOREIGN KEY (`field_id`)
-  REFERENCES `field` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-  ENGINE = InnoDB;
\ No newline at end of file
diff --git a/data/schema-0.3.mwb b/data/schema-0.3.mwb
deleted file mode 100644
index 67a60d9..0000000
Binary files a/data/schema-0.3.mwb and /dev/null differ
diff --git a/data/schema-0.3.mwb.bak b/data/schema-0.3.mwb.bak
deleted file mode 100644
index c283dc7..0000000
Binary files a/data/schema-0.3.mwb.bak and /dev/null differ
diff --git a/data/schema-0.3.sql b/data/schema-0.3.sql
index 4b6c5b9..a26d294 100644
--- a/data/schema-0.3.sql
+++ b/data/schema-0.3.sql
@@ -53,9 +53,9 @@ ENGINE = InnoDB;
 
 
 -- -----------------------------------------------------
--- Table `mydb`.`collection_field`
+-- Table `mydb`.`collectionfield`
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `mydb`.`collection_field` (
+CREATE TABLE IF NOT EXISTS `mydb`.`collectionfield` (
   `collection_id` INT NOT NULL,
   `field_id` INT NOT NULL,
   `id` INT NOT NULL AUTO_INCREMENT,
diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
index 8048c96..4d057d6 100644
--- a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
+++ b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>