Rename signals to be consistent with conventions