Updated Function Names for CPP Test