Changed to make the naming consistent
Added TODO for Chris