Merge "Include 'name' in props; use post-sanitize module name."