Clean up name args