Renamed packages to be more distinct to avoid confusion on install.