two more that refactor has missed
Cleanup renamed stuff