More name changes - this time enum names
Added support for foreign key if it is named differently than column