Rename TODO to current