Fixed the rest of the referrences I missed in the previous commit

Change-Id: I9b0849698ea45f6850c76f1498cedf66c8901ded