Should the rename be done before merging ? Enabled?