Structure change after org name change