Added TODO for aforementioned name twiddling.