Renamed some files/variables to coding convention.