Fixed regex and naming issues