expand regex to match more complex names