Fix dependencies and package names