Reapply the fix in 42908 for this file. This changes the function names