Attempt to fix package names