fix a few import statements, package prefixes