Remove foreign key and rename fixtures