--fixed the signal names to a common form