Cosmetic changes. (Function names & the order of parameters.)