Fix regex problem messing up name recognition