Renaming arguments and reordering functions for book reference