Additional domain naming fixes