Add foreign key association table for object types, renaming object types