Switch the order or the arguments to the Make functors

Signed-off-by: John Else <john.else@citrix.com>