Change JNDI lookup to avoid conflicts.