rename new-signal to signal, etc