Cleaning Up

Final pre-renaming cleanup.