Rename control register signals to be a bit more consistent.