Sketch renaming and reorganization