878634: Fix the final three uses of id instead of ID