Tweaks, including rename to meet guidelines for library developers.