1. I've done the rename.
2. Ah. Good find. Have refactored this out in a separate commit.