Merge "Fix breakage due to incomplete name change."