Starting to move over to rename plugin use case
Updating our tests
Making renames consistent