Names changes and ECF changes

More appropriate names and change in ECF testing library.