LP1865951: Fixes to consistency in two files, creating uniform capitalization and...