Modified package dependency and names to simplify upgrade and install