rebuild and rename