Renames some of the signals to reflect changes lower down