Post-Refactor Post-Renaming Draw to Render