Rename signals to be consistent throughout hierarchy.