CLC-3452 Rewrite using regex case