DiscriminatorColumn Metadata wrong

The discriminator column metadata (inheritance) is not properly processed. For example, using an entity described by XML annotations containing

<discriminiator-column name="category" type="string" length="30"/>

will generate wrong SQL queries containing the column 'dtype' instead of 'category' when using an XML metadata driver.
Generating classes from the XML metadata with

doctrine orm:generate-entities --generate-annotations="true" --generate-methods="true"  entities

produces wrong docblock annotations like

@ORM\DiscriminatorColumn(name="r", type="r", length=r)

However, the entity works as expected after correcting the annotation values and replacing the XML meatdata driver by an annotation metadata driver.