Change import names to match package