Better name parsing