Finished fix of jndiName binding.