Step 1 of rename
Step 2 of fix for issue #1