Rename misleading variables and add todo