Poking holes and renaming things.