Renamed a few missed suggestions from ReSharper.