Improved consistency across ordering of parameters as inputs to various functions

Signed-off-by: Mark Tompkins <mtompkins@firmusgrp.com>