Removed version from JNDI name and package names