Clean up package names; add sudo