rename intermediate signals to wr_wait/rd_wait