Update and rename Todo to TODO