Minor changes to signal names