Add controller name regex in state matching