Change order of function parameters and change some conventions to make Travis happy.