Name correction after new architecture.
Removed todo.