Updated full JNDI name for the different version/packaging scheme