Rename signals to be clearer