Update regex to match different namespaces cases 

Refs #256 loostro's regex proposition