Changed some names, removed some old TODOs.