Move and rename

69 files changed, 3 insertions, 4 deletions

diff --git a/sd-plugin/.gitignore b/integration/intellij/.gitignore
index fa33885331d..fa33885331d 100644
--- a/sd-plugin/.gitignore
+++ b/integration/intellij/.gitignore
diff --git a/sd-plugin/BACKLOG.md b/integration/intellij/BACKLOG.md
index 19e185dcc6b..19e185dcc6b 100644
--- a/sd-plugin/BACKLOG.md
+++ b/integration/intellij/BACKLOG.md
diff --git a/sd-plugin/README.md b/integration/intellij/README.md
index dbf31fccc6e..dbf31fccc6e 100644
--- a/sd-plugin/README.md
+++ b/integration/intellij/README.md
diff --git a/sd-plugin/build.gradle b/integration/intellij/build.gradle
index 5a4200d0062..5a4200d0062 100644
--- a/sd-plugin/build.gradle
+++ b/integration/intellij/build.gradle
diff --git a/sd-plugin/settings.gradle b/integration/intellij/settings.gradle
index bb8d23796e0..02eff8ccdfa 100644
--- a/sd-plugin/settings.gradle
+++ b/integration/intellij/settings.gradle
@@ -2,5 +2,4 @@
 
 // This sets the name of the generated zip file uploadable to Intellij Marketplace
 // (But not the actual *name* of the plugin, which is the name in plugin.xml)
-// Remove this if the directory and plugin name can be the same.
-rootProject.name = 'sd_language_plugin'
+rootProject.name = 'vespa'
diff --git a/sd-plugin/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf
index f01ce41dd64..f01ce41dd64 100644
--- a/sd-plugin/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf
+++ b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
index 01992ef4a5b..01992ef4a5b 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java
index bdf1bf3eb7b..bdf1bf3eb7b 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
index b02e8371b77..b02e8371b77 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCommenter.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
index a8872f71b63..a8872f71b63 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
index 3e5b53c87ea..3e5b53c87ea 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdFileType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
index b469d0c0ebb..b469d0c0ebb 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdFileType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdIcons.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdIcons.java
index 96f8428b223..96f8428b223 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdIcons.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdIcons.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguage.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguage.java
index c4d471ee737..c4d471ee737 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguage.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguage.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
index 5f618a62d6e..5f618a62d6e 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
index 24de7bb6253..24de7bb6253 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdReference.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdReference.java
index 6404a738e59..6404a738e59 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdReference.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdReference.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
index df3da81e9fc..df3da81e9fc 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
index 6cf30ecb54e..6cf30ecb54e 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdUtil.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
index f3f949d645f..f3f949d645f 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdUtil.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
index ab463562355..ab463562355 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
index 76b82d7c857..76b82d7c857 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
index 4609f2e7fbb..4609f2e7fbb 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
index 98be15778e7..98be15778e7 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
index a86fb2b058b..a86fb2b058b 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
index fd3073b6016..fd3073b6016 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
index 0726e103943..0726e103943 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
index 6f24ce27476..6f24ce27476 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
index 38817e15553..38817e15553 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
index f99a82dc81a..f99a82dc81a 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
index f7f243356b9..f7f243356b9 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
index 053e7bd20f9..053e7bd20f9 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
index 37fd336b615..37fd336b615 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
index 444e71978c9..444e71978c9 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java
index dc925f0f369..dc925f0f369 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java
index 8b474dcff69..8b474dcff69 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
index d5b76c039d0..d5b76c039d0 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java
index c2880181d66..c2880181d66 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java
index 129a32153f0..129a32153f0 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
index 7cd2d7f9331..7cd2d7f9331 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java
index d6cbcece6d5..d6cbcece6d5 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
index e8154bce8ad..e8154bce8ad 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
index 1260883c96f..1260883c96f 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java
index e7fa94cf81c..e7fa94cf81c 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdIdentifier.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdIdentifier.java
index 1ac88cb3acd..1ac88cb3acd 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdIdentifier.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdIdentifier.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java
index 0cd7cedc967..0cd7cedc967 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
index e42906530b0..e42906530b0 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
index 43c02ea4fcf..43c02ea4fcf 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
index 897217c082c..897217c082c 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
index 3f69952d0b6..3f69952d0b6 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
index ee328f43075..ee328f43075 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
index 71d93641939..71d93641939 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
index 76662c5cd31..76662c5cd31 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
index 3d7b3a1a275..3d7b3a1a275 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
index 1f1c271dcf6..1f1c271dcf6 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
diff --git a/sd-plugin/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
index b4491acc717..b4491acc717 100644
--- a/sd-plugin/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
+++ b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
diff --git a/sd-plugin/src/main/resources/META-INF/plugin.xml b/integration/intellij/src/main/resources/META-INF/plugin.xml
index c92be82777f..49db6c59b3e 100644
--- a/sd-plugin/src/main/resources/META-INF/plugin.xml
+++ b/integration/intellij/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <idea-plugin>
     <id>ai.vespa</id>
-    <name>SdReader</name>
+    <name>Vespa</name>
 
     <!-- Text to display as company information on Preferences/Settings | Plugin page -->
     <vendor>vespa.ai</vendor>
@@ -12,7 +12,7 @@
 
     <!-- Text to display as description on Preferences/Settings | Plugin page -->
     <description><![CDATA[
-    <p>Vespa Schema (.sd file) Editor</p>
+    <p>Vespa.ai schema file support</p>
     ]]></description>
     
     <!-- Extension points defined by the plugin -->
diff --git a/sd-plugin/src/main/resources/META-INF/pluginIcon.png b/integration/intellij/src/main/resources/META-INF/pluginIcon.png
index c8dc4764e35..c8dc4764e35 100644
--- a/sd-plugin/src/main/resources/META-INF/pluginIcon.png
+++ b/integration/intellij/src/main/resources/META-INF/pluginIcon.png
diff --git a/sd-plugin/src/main/resources/META-INF/pluginIcon_dark.png b/integration/intellij/src/main/resources/META-INF/pluginIcon_dark.png
index c8dc4764e35..c8dc4764e35 100644
--- a/sd-plugin/src/main/resources/META-INF/pluginIcon_dark.png
+++ b/integration/intellij/src/main/resources/META-INF/pluginIcon_dark.png
diff --git a/sd-plugin/src/main/resources/icons/document_icon.png b/integration/intellij/src/main/resources/icons/document_icon.png
index 497c218ab91..497c218ab91 100644
--- a/sd-plugin/src/main/resources/icons/document_icon.png
+++ b/integration/intellij/src/main/resources/icons/document_icon.png
diff --git a/sd-plugin/src/main/resources/icons/document_summary_icon.png b/integration/intellij/src/main/resources/icons/document_summary_icon.png
index 72f42c68902..72f42c68902 100644
--- a/sd-plugin/src/main/resources/icons/document_summary_icon.png
+++ b/integration/intellij/src/main/resources/icons/document_summary_icon.png
diff --git a/sd-plugin/src/main/resources/icons/first_phase_icon.png b/integration/intellij/src/main/resources/icons/first_phase_icon.png
index 18f24e9e462..18f24e9e462 100644
--- a/sd-plugin/src/main/resources/icons/first_phase_icon.png
+++ b/integration/intellij/src/main/resources/icons/first_phase_icon.png
diff --git a/sd-plugin/src/main/resources/icons/imported_field_icon.png b/integration/intellij/src/main/resources/icons/imported_field_icon.png
index 1ec9b1d6a96..1ec9b1d6a96 100644
--- a/sd-plugin/src/main/resources/icons/imported_field_icon.png
+++ b/integration/intellij/src/main/resources/icons/imported_field_icon.png
diff --git a/sd-plugin/src/main/resources/icons/macro_icon.png b/integration/intellij/src/main/resources/icons/macro_icon.png
index 736d8168119..736d8168119 100644
--- a/sd-plugin/src/main/resources/icons/macro_icon.png
+++ b/integration/intellij/src/main/resources/icons/macro_icon.png
diff --git a/sd-plugin/src/main/resources/icons/override_macro_icon.png b/integration/intellij/src/main/resources/icons/override_macro_icon.png
index 024eb777eef..024eb777eef 100644
--- a/sd-plugin/src/main/resources/icons/override_macro_icon.png
+++ b/integration/intellij/src/main/resources/icons/override_macro_icon.png
diff --git a/sd-plugin/src/main/resources/icons/sd_icon.png b/integration/intellij/src/main/resources/icons/sd_icon.png
index 1c96aaee633..1c96aaee633 100644
--- a/sd-plugin/src/main/resources/icons/sd_icon.png
+++ b/integration/intellij/src/main/resources/icons/sd_icon.png
diff --git a/sd-plugin/src/main/resources/icons/struct_field_icon.png b/integration/intellij/src/main/resources/icons/struct_field_icon.png
index 7f5074630d4..7f5074630d4 100644
--- a/sd-plugin/src/main/resources/icons/struct_field_icon.png
+++ b/integration/intellij/src/main/resources/icons/struct_field_icon.png
diff --git a/sd-plugin/src/main/resources/icons/struct_icon.png b/integration/intellij/src/main/resources/icons/struct_icon.png
index c2f6fdc8440..c2f6fdc8440 100644
--- a/sd-plugin/src/main/resources/icons/struct_icon.png
+++ b/integration/intellij/src/main/resources/icons/struct_icon.png
diff --git a/sd-plugin/src/main/resources/icons/summary_def_icon.png b/integration/intellij/src/main/resources/icons/summary_def_icon.png
index a8faf12601f..a8faf12601f 100644
--- a/sd-plugin/src/main/resources/icons/summary_def_icon.png
+++ b/integration/intellij/src/main/resources/icons/summary_def_icon.png