Add a service does not detect that another service with the same name exists

I have set up two clusters that share a Cloudera Manger.
The first I set up with the API and created the services with capital letter names, e.g., ZOOKEEPER, HDFS, HIVE.
Now, I add the second cluster using the Wizard.
Add Cluster->Select Hosts->Distribute Parcels->Select base HDFS Cluster install
On the next page i get SQL errros telling that the services i want to add already exist. I suspect that the check for existing service names does not include capitalized letters.
Note that renaming the services does not help, as it would only change the DisplayName in the database and not the Name column, which is unfortunately also a key column.

Here the excerpt of the error message (attached full log).
javax.persistence.PersistenceException:org.hibernate.exception.ConstraintViolationException: could not perform addBatch
at AbstractEntityManagerImpl.java line 1387
in org.hibernate.ejb.AbstractEntityManagerImpl convert()
[15:47:12] Anita Sobe - work: Caused by: java.sql.BatchUpdateException:Duplicate entry 'zookeeper' for key 'NAME'
at PreparedStatement.java line 2024
in com.mysql.jdbc.PreparedStatement executeBatchSerially()