Update README to reflect naming + add TODO