Fixed file names and method params to be consistant with others.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/JacobSheppard/MSL
Updated another file to be more consistant.