clarify namespace references
change for arg order consistency
change for arg order consistency