fix moved and renamed regex