Rename some jars for clarity