Fix inverted function names
Add TODO reminder