comments and rename