Rename more credential* to host