Correct parameter ordering and allow override of binary type name