NOCA Import vs. Company Data Standards

We decided to go the route of using Zeta for our NCOA processing moving forward after many hours of manual data manipulation to make other options work for us. The process was super easy and smooth. What I didn't realize until a week later is that our policy is that Apt, Ste, Unit, etc goes in Street2 but when the data came back and was imported it had it all in Street1. Has anyone had this happen and has a clever script to fix it? Conversely, is it better if we just change our company data standards to match what the USPS uses?