Additional variable casing changes related to rev. 3a9d0d2.