Adjust package names