Issue #61 - ENTITY_TYPE name changed to EntityType, ID and EntityTypeID.