I'd go ahead and make the change right now. You won't be allowed to configure iSCSI failover if both hostnames match anyway.
Keep in mind that DSSv6 distinguishes between the server name and the hostname. Feel free to change them both.