Renamed some functions

Renamed the stop-tracing and merges-cf functions