Finishing the rename in the comments and synopsis