Added package name variation
Major upgrade for cad models.