Flesh out rename and fix up code coverage