system since I figure that's on its way out the door)

all necessary fields have been updated to reflect naming changes

Changed import statements to break local testing but fix automatic conda build testing. I'm not sure how to resolve the different import needs.