Renamed variables which are constants to UPPER_CASE.
Merge branch 'master' into new-annotations