Deal with package name differences between platforms, fix metadata