Do some modifies and rename