Namespace fixups, and proper java management