Renames and added todo to fix bug