Fix DS naming when domain is specified