Reversed change, to allow static variables to be defined and declared all in uppercase.