Simplify name parsing