Fix for SDK-1503, domain object name collision