Structure change and renaming