Fix names method using regex