Updates for standardising package names, and other bits