Minor name cleanup (I don't like GitHub's naming conventions).