Refactoring jaRegistryBundle to RegistryBundle