Finish renaming of ECHO_SERVER to ECHO