improved JNDI name for datasource