improved jndi names (for package name changes)