Some changes to the exported state will need to be made as a result of the Layout Server Integration and renaming.