adjust package names again