FIX macro names in TODO