Update generated code after object model shuffle