Tweaks to naming and the like following review