Better naming for internal marshal functions to avoid confusion