Non 423 ESPP

I am employed by SAP. We have a  non 423 ESPP plan which is taxed through out the year. I have confirmed that the cost basis shown in my brokerage account includes the employer match so does not require adjusting. However, I do not know how to classify the sale of stock I made and which is on my 1099-B. Do I classify it as an ESPP even though it is non 423? Would it be considered a NQSO? Also my 1099 B lumped short term and long term amounts together. Can I still import and correct or should I delete the line entirely and enter manually? Thank you!