Fix name conflict with legacy original Gem