CONN-1034: Updated package names for imports