Small naming fixes, and mark a TODO