Verify that names are provided.
Removed todos.