Add TODO for name scoping in methods