More docs/setup fixes from rename