diff --git a/assignment/impl/pom.xml b/assignment/impl/pom.xml
index fb82035a8675..c38a094c8364 100644
--- a/assignment/impl/pom.xml
+++ b/assignment/impl/pom.xml
@@ -217,16 +217,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
             <version>${sakai.version}</version>
         </dependency>
     </dependencies>
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
index 192b02cb78b6..e9781bfd333b 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
@@ -104,7 +104,7 @@
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.calendar.api.Calendar;
 import org.sakaiproject.calendar.api.CalendarEvent;
 import org.sakaiproject.calendar.api.CalendarService;
@@ -4253,7 +4253,7 @@ public Map<String, String> transferCopyEntities(String fromContext, String toCon
                     // If there is a LTI launch associated with this copy it over
                     if ( oAssignment.getContentId() != null ) {
                         Long contentKey = oAssignment.getContentId().longValue();
-                        Object retval = SakaiBLTIUtil.copyLTIContent(contentKey, toContext, fromContext);
+                        Object retval = SakaiLTIUtil.copyLTIContent(contentKey, toContext, fromContext);
                         if ( retval instanceof Long ) {
                             nAssignment.setContentId(((Long) retval).intValue());
                         // If something went wrong, we can't be an LTI submission in the new site
diff --git a/assignment/tool/pom.xml b/assignment/tool/pom.xml
index 91de5744cf4f..6f7fffc233d5 100644
--- a/assignment/tool/pom.xml
+++ b/assignment/tool/pom.xml
@@ -92,17 +92,17 @@
             <artifactId>sakai-velocity-tool</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java b/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
index 9415ce0b13b6..41e80979a9d9 100644
--- a/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
+++ b/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
@@ -689,7 +689,7 @@ private Map<String, Object> submissionToMap(Set<String> activeSubmitters, Assign
                     if ( content != null ) {
                         String contentItem = StringUtils.trimToEmpty((String) content.get(LTIService.LTI_CONTENTITEM));
                         // Instead of parsing, the JSON we just look for a simple existance of the submission review entry
-                        // Delegate the complex understanding of the launch to SakaiBLTIUtil
+                        // Delegate the complex understanding of the launch to SakaiLTIUtil
                         // TODO: Eventually, Sakai's LTIService will implement a submissionReview checkbox and we should check for that here
                         boolean submissionReviewAvailable = contentItem.indexOf("\"submissionReview\"") > 0;
 
@@ -1098,7 +1098,7 @@ public ActionReturn getGradableForSite(EntityView view , Map<String, Object> par
                             ltiSubmissionLaunch = "/access/lti/site/" + siteId + "/content:" + contentKey + "?for_user=" + submitter.get("id");
 
                             // Instead of parsing, the JSON we just look for a simple existance of the submission review entry
-                            // Delegate the complex understanding of the launch to SakaiBLTIUtil
+                            // Delegate the complex understanding of the launch to SakaiLTIUtil
                             if ( contentItem.indexOf("\"submissionReview\"") > 0 ) {
                                 ltiSubmissionLaunch = ltiSubmissionLaunch + "&message_type=content_review";
                             }
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
index 6dfe1ec3f73e..cf70d32e14eb 100644
--- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
+++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -165,7 +165,7 @@
 import org.sakaiproject.authz.api.Role;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 import org.tsugi.lti13.LTICustomVars;
 import org.tsugi.lti13.DeepLinkResponse;
 import org.tsugi.lti13.LTI13Util;
@@ -256,7 +256,7 @@
 import org.sakaiproject.util.comparator.AlphaNumericComparator;
 import org.sakaiproject.util.comparator.UserSortNameComparator;
 import org.sakaiproject.lti.api.LTIService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -1998,12 +1998,12 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                 }
 
                 // Ignore the Content Item - use the value in the assignment if tool allows
-                context.put("newpage", Boolean.valueOf(SakaiBLTIUtil.getNewpage(tool, null, newpage)));
-                context.put("height",SakaiBLTIUtil.getFrameHeight(tool, content, "1200px"));
+                context.put("newpage", Boolean.valueOf(SakaiLTIUtil.getNewpage(tool, null, newpage)));
+                context.put("height",SakaiLTIUtil.getFrameHeight(tool, content, "1200px"));
                 context.put("browser-feature-allow", String.join(";", serverConfigurationService.getStrings("browser.feature.allow")));
 
                 // Copy title, description, and dates from Assignment to content if mis-match
-                int protect = SakaiBLTIUtil.getInt(content.get(LTIService.LTI_PROTECT));
+                int protect = SakaiLTIUtil.getInt(content.get(LTIService.LTI_PROTECT));
                 String assignmentTitle = StringUtils.trimToEmpty(assignment.getTitle());
                 String assignmentDesc = StringUtils.trimToEmpty(assignment.getInstructions());
                 Instant visibleDate = assignment.getVisibleDate();
@@ -2021,7 +2021,7 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                 String placement_secret = StringUtils.trimToNull((String) content.get(LTIService.LTI_PLACEMENTSECRET));
 
                 String content_settings = (String) content.get(LTIService.LTI_SETTINGS);
-                JSONObject content_json = BasicLTIUtil.parseJSONObject(content_settings);
+                JSONObject content_json = LTIUtil.parseJSONObject(content_settings);
                 String contentVisibleDate = StringUtils.trimToEmpty((String) content_json.get(DeepLinkResponse.RESOURCELINK_AVAILABLE_STARTDATETIME));
                 String contentOpenDate = StringUtils.trimToEmpty((String) content_json.get(DeepLinkResponse.RESOURCELINK_SUBMISSION_STARTDATETIME));
                 String contentDueDate = StringUtils.trimToEmpty((String) content_json.get(DeepLinkResponse.RESOURCELINK_SUBMISSION_ENDDATETIME));
@@ -2045,7 +2045,7 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                     content_json.put(LTIService.LTI_DESCRIPTION, assignmentDesc);
                     content_json.put(LTIService.LTI_PROTECT, new Integer(1));
 
-                    // Copy assignment specific custom parameter substitutions to pass into SakaiBLTIUtil
+                    // Copy assignment specific custom parameter substitutions to pass into SakaiLTIUtil
                     content_json.put(DeepLinkResponse.RESOURCELINK_AVAILABLE_STARTDATETIME, assignmentVisibleDate);
                     content_json.put(DeepLinkResponse.RESOURCELINK_SUBMISSION_STARTDATETIME, assignmentOpenDate);
                     content_json.put(DeepLinkResponse.RESOURCELINK_AVAILABLE_ENDDATETIME, assignmentDueDate);
@@ -2061,8 +2061,8 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                 }
 
                 // Unlock this assignment for one launch...
-                String launch_code_key = SakaiBLTIUtil.getLaunchCodeKey(content);
-                String launch_code = SakaiBLTIUtil.getLaunchCode(content);
+                String launch_code_key = SakaiLTIUtil.getLaunchCodeKey(content);
+                String launch_code = SakaiLTIUtil.getLaunchCode(content);
                 if ( launch_code_key != null && launch_code != null ) {
                     Session session = sessionManager.getCurrentSession();
                     session.setAttribute(launch_code_key, launch_code);
@@ -3634,7 +3634,7 @@ protected void setAssignmentFormContext(SessionState state, Context context) {
         }
 
         Placement placement = toolManager.getCurrentPlacement();
-        // String contentReturn = SakaiBLTIUtil.getOurServerUrl() + "/portal/tool/" + placement.getId() +
+        // String contentReturn = SakaiLTIUtil.getOurServerUrl() + "/portal/tool/" + placement.getId() +
         String contentReturn = serverConfigurationService.getToolUrl() + "/" + placement.getId()
                 + "/sakai.lti.admin.helper.helper"
                 + "?panel=AssignmentsMain"
@@ -10343,7 +10343,7 @@ public void doEdit_assignment(RunData data) {
                             Map<String, Object> tool = ltiService.getTool(toolKey, site.getId());
                             String toolTitle = (String) tool.get(LTIService.LTI_TITLE);
                             state.setAttribute(NEW_ASSIGNMENT_CONTENT_TITLE, toolTitle);
-                            Long toolNewpage = SakaiBLTIUtil.getLong(tool.get(LTIService.LTI_NEWPAGE));
+                            Long toolNewpage = SakaiLTIUtil.getLong(tool.get(LTIService.LTI_NEWPAGE));
                             state.setAttribute(NEW_ASSIGNMENT_CONTENT_TOOL_NEWPAGE, toolNewpage);
                         }
                     } catch(org.sakaiproject.exception.IdUnusedException e ) {
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm
index db6ce03b555b..aa4bc1964faf 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm
@@ -579,7 +579,7 @@
         </div>
 		<div class="form-group row">
 			<div class="col-sm-6">
-                    <a title="$tlang.getString('external.tool.find')" target="sakai-basiclti-admin-iframe" onclick="showExternalIframe(this.title, false);"
+                    <a title="$tlang.getString('external.tool.find')" target="sakai-lti-admin-iframe" onclick="showExternalIframe(this.title, false);"
                         class="btn btn-primary" role="button"
                         href="$findExternalToolUrl">$tlang.getString('external.tool.find')</a>
             </div>
@@ -598,7 +598,7 @@
 		</fieldset>
         </div>
         <div id="external-modal-iframe-div" style="display:none" tabindex="-1" role="dialog">
-            <iframe name="sakai-basiclti-admin-iframe" id="sakai-basiclti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
+            <iframe name="sakai-lti-admin-iframe" id="sakai-lti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
         </div>
 <style>
 .ui-widget-overlay.ui-front {
@@ -617,8 +617,8 @@ function showExternalIframe(title, doreload) {
         open: function() {
             $("#external-modal-iframe-div").dialog("option", "width", modalDialogWidth());
             $("#external-modal-iframe-div").dialog("option", "height", modalDialogHeight());
-            $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-            $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+            $('#sakai-lti-admin-iframe').attr('width', '100%');
+            $('#sakai-lti-admin-iframe').attr('height', '100%');
             // https://stackoverflow.com/questions/1202079/prevent-jquery-ui-dialog-from-setting-focus-to-first-textbox
             $(this).parent().focus();
         },
@@ -626,7 +626,7 @@ function showExternalIframe(title, doreload) {
             if ( doreload ) {
                 location.reload();
             } else {
-                $('#sakai-basiclti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
+                $('#sakai-lti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
             }
         }
     });
@@ -634,8 +634,8 @@ function showExternalIframe(title, doreload) {
     $(window).resize(function() {
         $("#external-modal-iframe-div").dialog("option", "width", modalDialogWidth());
         $("#external-modal-iframe-div").dialog("option", "height", modalDialogHeight());
-        $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-        $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+        $('#sakai-lti-admin-iframe').attr('width', '100%');
+        $('#sakai-lti-admin-iframe').attr('height', '100%');
     });
 }
 //]]>
diff --git a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
index d485c322b9d1..d40eb3614973 100644
--- a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
+++ b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -2241,12 +2241,12 @@
 # DEFAULT: false
 # lti.provider.enabled=true
 
-# BasicLTI Provider-enabled tools
+# LTI Provider-enabled tools
 # Colon separated list of tool ids
 # DEFAULT: none
 # lti.provider.allowedtools=sakai.announcements:sakai.singleuser:sakai.assignment.grades:blogger:sakai.dropbox:sakai.mailbox:sakai.forums:sakai.gradebook.tool:sakai.podcasts:sakai.poll:sakai.resources:sakai.schedule:sakai.samigo:sakai.rwiki
 
-# BasicLTI Provider secret - you must provide a password
+# LTI Provider secret - you must provide a password
 # DEFAULT: none (null)
 # lti.provider.[hostname].secret=
 
@@ -5579,7 +5579,7 @@ rubrics.integration.token-secret=12345678900909091234
 # They don't have any "--- BEGIN" headers and are not broken into short lines but they contain the
 # same material as PEM format keys with the headers.
 # You can see sample Java code to generate these keys in Java in:
-# basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
+# lti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
 # DEFAULT: None
 # lti.advantage.lti13servlet.public=MIIBIjANBgkqhkidjkssdhjk...
 # lti.advantage.lti13servlet.private=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYw...
@@ -5909,15 +5909,15 @@ rubrics.integration.token-secret=12345678900909091234
 
 # Override the default outbound Sakai role to LTI role mapping. The LTI roles are documented at https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 # lti.outbound.role.map
-# DEFAULT: The default is a long set of roles defined in the SakaiBLTIUtil class and documented in basiclti/docs/LTIROLES.md
+# DEFAULT: The default is a long set of roles defined in the SakaiLTIUtil class and documented in lti/docs/LTIROLES.md
 
 # Override the default inbound LTI role to Sakai role mapping. The LTI roles are documented at https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 # lti.inbound.role.map
-# DEFAULT: The default is a long set of roles defined in the SakaiBLTIUtil class and documented in basiclti/docs/LTIROLES.md
+# DEFAULT: The default is a long set of roles defined in the SakaiLTIUtil class and documented in lti/docs/LTIROLES.md
 
 # Override the legacy LTI roles to modern LTI roles. The LTI roles are documented at https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 # lti.legacy.role.map
-# DEFAULT: The default is a set of roles defined in the SakaiBLTIUtil class.  These are roles like 'urn:lti:instrole:ims/lis/Administrator' from LTI 1.0.  The default setting is likely all you need.
+# DEFAULT: The default is a set of roles defined in the SakaiLTIUtil class.  These are roles like 'urn:lti:instrole:ims/lis/Administrator' from LTI 1.0.  The default setting is likely all you need.
 
 # In order to protect "at rest" LTI 1.1 secrets stored in the database, Sakai provides
 # a property to encrypt the secrets.  # The string can be a passphrase or
diff --git a/gradebookng/impl/pom.xml b/gradebookng/impl/pom.xml
index 886077f68d25..bb0e7e36c442 100644
--- a/gradebookng/impl/pom.xml
+++ b/gradebookng/impl/pom.xml
@@ -88,14 +88,14 @@
             <artifactId>sakai-plus-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/help/help/src/sakai_screensteps_plusAdminAdministratorGuide/howdoIinstallSakaiPlusinmyenterpriseLMS.html b/help/help/src/sakai_screensteps_plusAdminAdministratorGuide/howdoIinstallSakaiPlusinmyenterpriseLMS.html
index 743d8cbe1005..18992752c690 100644
--- a/help/help/src/sakai_screensteps_plusAdminAdministratorGuide/howdoIinstallSakaiPlusinmyenterpriseLMS.html
+++ b/help/help/src/sakai_screensteps_plusAdminAdministratorGuide/howdoIinstallSakaiPlusinmyenterpriseLMS.html
@@ -104,7 +104,7 @@ <h2 class="step-title screensteps-heading">Enter the information for your new te
 <strong>Realm Template: </strong>This specifies an existing Sakai realm (for example, !site.template.lti) which will be copied to set the roles and permissions used when creating a new site when Sakai Plus receives an incoming site. The default is !site.template.lti unless it is changed using the plus.new.site.realm Sakai property.</li>
 <li>
 <strong>Inbound Role Map:</strong><em> </em>This field allows for overriding the default mapping from incoming LTI roles to Sakai roles. See this documentation for detail on how role mapping works and the format for role mapping entries.<ol style="list-style-type:lower-alpha;">
-<li><a href="https://github.com/sakaiproject/sakai/blob/master/basiclti/docs/LTIROLES.md">Sakai to LTI Role Mapping</a></li>
+<li><a href="https://github.com/sakaiproject/sakai/blob/master/lti/docs/LTIROLES.md">Sakai to LTI Role Mapping</a></li>
 </ol>
 </li>
 <li>
diff --git a/lessonbuilder/tool/pom.xml b/lessonbuilder/tool/pom.xml
index 942a1280b906..ad80455bccda 100644
--- a/lessonbuilder/tool/pom.xml
+++ b/lessonbuilder/tool/pom.xml
@@ -20,16 +20,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.portal</groupId>
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java
index 57d7456bf072..b4ca6d5b9796 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java
@@ -52,8 +52,8 @@
 import org.sakaiproject.site.api.SiteService;
 import org.sakaiproject.tool.api.ToolManager;
 
-import org.tsugi.basiclti.BasicLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.tsugi.lti.LTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 
 /**
  * Interface to LTI Content Items
@@ -363,7 +363,7 @@ public List<UrlItem> createNewUrls(SimplePageBean bean, Integer bltiToolId) {
 
     public boolean isPopUp() {
         loadContent();
-        return SakaiBLTIUtil.getNewpage(tool, content, false);
+        return SakaiLTIUtil.getNewpage(tool, content, false);
     }
 
     public int frameSize() {
@@ -432,11 +432,11 @@ public String doImportTool(String launchUrl, String bltiTitle, String strXml, St
         if ( ltiService == null ) return null;
         log.debug("bltiTitle={} launchUrl={} open_same_window=", bltiTitle, bltiTitle, open_same_window);
 
-        String toolBaseUrl = SakaiBLTIUtil.stripOffQuery(launchUrl);
+        String toolBaseUrl = SakaiLTIUtil.stripOffQuery(launchUrl);
 
         // Lets find the right tool to assiociate with
         List<Map<String,Object>> tools = ltiService.getTools(null,null,0,0, simplePageBean.getCurrentSiteId());
-        Map<String, Object> theTool = SakaiBLTIUtil.findBestToolMatch(launchUrl, tools);
+        Map<String, Object> theTool = SakaiLTIUtil.findBestToolMatch(launchUrl, tools);
 
         if ( theTool == null ) {
             log.debug("Inserting new tool title={} url={}",bltiTitle, launchUrl);
@@ -473,7 +473,7 @@ public String doImportTool(String launchUrl, String bltiTitle, String strXml, St
             props.setProperty(LTIService.LTI_TOOL_ID, toolId);
             props.setProperty(LTIService.LTI_TITLE, bltiTitle);
             props.setProperty(LTIService.LTI_LAUNCH,launchUrl);
-            props.setProperty(LTIService.LTI_NEWPAGE, SakaiBLTIUtil.getNewpage(tool, null, open_same_window) ? "1" : "0");
+            props.setProperty(LTIService.LTI_NEWPAGE, SakaiLTIUtil.getNewpage(tool, null, open_same_window) ? "1" : "0");
             props.setProperty(LTIService.LTI_XMLIMPORT,strXml);
             if ( custom != null ) props.setProperty(LTIService.LTI_CUSTOM,custom);
             Object result = ltiService.insertContent(props, simplePageBean.getCurrentSiteId());
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java
index d1b37a94c304..62df422eb138 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java
@@ -82,7 +82,7 @@
 import org.sakaiproject.authz.api.AuthzRealmLockException;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.content.api.ContentHostingService;
@@ -2304,7 +2304,7 @@ private String transferAttachmentFiles(String msgBody, String oldSiteId, String
 
 	private String copyLTIContent(Map<String, Object> ltiContent, String siteId, String oldSiteId)
 	{
-		Object result = SakaiBLTIUtil.copyLTIContent(ltiContent, siteId, oldSiteId);
+		Object result = SakaiLTIUtil.copyLTIContent(ltiContent, siteId, oldSiteId);
 		String sakaiId = null;
 		if ( result == null ) {
 			return null;
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
index dd8b92393c23..da9ce7ec8651 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
@@ -40,7 +40,7 @@
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.condition.api.ConditionService;
 import org.sakaiproject.condition.api.model.Condition;
@@ -126,7 +126,7 @@
 import org.sakaiproject.util.comparator.AlphaNumericComparator;
 import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
-import org.tsugi.basiclti.ContentItem;
+import org.tsugi.lti.ContentItem;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.rsf.components.UIContainer;
 import uk.org.ponder.rsf.components.UIInternalLink;
@@ -7028,7 +7028,7 @@ public void handleImportItem() {
 
                 // Retrieve the tool associated with the content item
                 String toolId = ToolUtils.getRequestParameter("toolId");
-                Long toolKey = SakaiBLTIUtil.getLongNull(toolId);
+                Long toolKey = SakaiLTIUtil.getLongNull(toolId);
                 if ( toolKey == 0 || toolKey < 0 ) {
                         setErrKey("simplepage.lti-import-error-id", toolId);
                         return;
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiImportItemProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiImportItemProducer.java
index c0e21c9b4819..6499ff0a6bd8 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiImportItemProducer.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiImportItemProducer.java
@@ -51,7 +51,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.lessonbuildertool.model.SimplePageToolDao;
 import org.sakaiproject.lessonbuildertool.tool.beans.SimplePageBean;
@@ -62,7 +62,7 @@
 import org.sakaiproject.tool.api.ToolSession;
 import org.sakaiproject.tool.cover.SessionManager;
 
-import org.tsugi.basiclti.ContentItem;
+import org.tsugi.lti.ContentItem;
 
 /**
  * Creates a list of LTI Content Items for the user to choose from. Their choice will be added
@@ -175,7 +175,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon
 			for ( int i = 0 ; i < toolsImportItem.size(); i++ ) {
 				Map<String, Object> tool = toolsImportItem.get(i);
 				if ( tool == null ) continue;
-				Long toolId = SakaiBLTIUtil.getLongNull(tool.get(LTIService.LTI_ID));
+				Long toolId = SakaiLTIUtil.getLongNull(tool.get(LTIService.LTI_ID));
 
 				// Create a POSTable URL back to this application with the right parameters
 				// Since the external tool will be setting all the POST data per Content Item spec, we need to 
@@ -191,7 +191,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon
 					"/sakai.lti.admin.helper.helper?panel=ContentConfig&flow=import&tool_id=" +
 					tool.get(LTIService.LTI_ID) + "&returnUrl=" + URLEncoder.encode(contentReturn);
 
-				String title = SakaiBLTIUtil.getToolTitle(tool, null, null);
+				String title = SakaiLTIUtil.getToolTitle(tool, null, null);
 				if ( StringUtils.isEmpty(title) ) title = messageLocator.getMessage("simplepage.blti.config");
 				UIBranchContainer link = UIBranchContainer.make(tofill, "blti-launch:");
 				UILink.make(link, "blti-launch-link", title, helperUrl)
diff --git a/lessonbuilder/tool/src/webapp/js/show-page.js b/lessonbuilder/tool/src/webapp/js/show-page.js
index a1eb80d69ac2..59dc63b50f65 100644
--- a/lessonbuilder/tool/src/webapp/js/show-page.js
+++ b/lessonbuilder/tool/src/webapp/js/show-page.js
@@ -3819,8 +3819,8 @@ function showIframe(title, doreload) {
     open: function () {
       $("#modal-iframe-div-blti").dialog("option", "width", modalDialogWidth());
       $("#modal-iframe-div-blti").dialog("option", "height", modalDialogHeight());
-      $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-      $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+      $('#sakai-lti-admin-iframe').attr('width', '100%');
+      $('#sakai-lti-admin-iframe').attr('height', '100%');
       // https://stackoverflow.com/questions/1202079/prevent-jquery-ui-dialog-from-setting-focus-to-first-textbox
       $(this).parent().focus();
     },
@@ -3828,15 +3828,15 @@ function showIframe(title, doreload) {
       if ( doreload ) {
         location.reload();
       } else {
-        $('#sakai-basiclti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
+        $('#sakai-lti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
       }
     }
   });
   $(window).resize(function () {
     $("#modal-iframe-div-blti").dialog("option", "width", modalDialogWidth());
     $("#modal-iframe-div-blti").dialog("option", "height", modalDialogHeight());
-    $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-    $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+    $('#sakai-lti-admin-iframe').attr('width', '100%');
+    $('#sakai-lti-admin-iframe').attr('height', '100%');
   });
 }
 function fixAddBeforeLTI(el) {
diff --git a/lessonbuilder/tool/src/webapp/templates/BltiPicker.html b/lessonbuilder/tool/src/webapp/templates/BltiPicker.html
index 64ffa3e1c006..6526f5858f45 100644
--- a/lessonbuilder/tool/src/webapp/templates/BltiPicker.html
+++ b/lessonbuilder/tool/src/webapp/templates/BltiPicker.html
@@ -35,7 +35,7 @@
 		<form action="#" rsf:id="blti-cancel" id="blti-cancel">
 			<input type="hidden" rsf:id="csrf"/>
 			<input type="hidden" rsf:id="cancel2"/>
-		<a rsf:id="blti-launch-link" href="#" id="blti-launch-link" class="btn btn-primary" target="sakai-basiclti-admin-iframe" onclick="showIframe();">
+		<a rsf:id="blti-launch-link" href="#" id="blti-launch-link" class="btn btn-primary" target="sakai-lti-admin-iframe" onclick="showIframe();">
 			<span rsf:id="blti-select-text" class="blti-select-text" id="blti-select-text"></span>
         </a>
 			<input type="submit" rsf:id="cancel" class='cancelButton'/>
@@ -49,7 +49,7 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
           <div class="modal-body">
-			      <iframe name="sakai-basiclti-admin-iframe" id="sakai-basiclti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
+			      <iframe name="sakai-lti-admin-iframe" id="sakai-lti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
           </div>
         </div>
       </div>
@@ -73,12 +73,12 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
       el.addEventListener("shown.bs.modal", e => {
         console.log('Height', modalDialogHeight());
         $('#modal-iframe-div').attr('height', modalDialogHeight());
-        $('#sakai-basiclti-admin-iframe').attr('width', $("#modal-iframe-div").width());
-        $('#sakai-basiclti-admin-iframe').attr('height', modalDialogHeight()-50);
+        $('#sakai-lti-admin-iframe').attr('width', $("#modal-iframe-div").width());
+        $('#sakai-lti-admin-iframe').attr('height', modalDialogHeight()-50);
       });
 
       el.addEventListener("hidden.bs.modal", e => {
-          $('#sakai-basiclti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
+          $('#sakai-lti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
           var form = document.getElementById("blti-cancel");
           if ( form != null ) {
               console.debug("Cancelling");
@@ -91,8 +91,8 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
         modal.handleUpdate();
         // Note that width() gives the content width, taking into consideration the border, padding, etc.
         console.log('Height', modalDialogHeight());
-        $('#sakai-basiclti-admin-iframe').attr('width', $("#modal-iframe-div").width());
-        $('#sakai-basiclti-admin-iframe').attr('height', modalDialogHeight()-50);
+        $('#sakai-lti-admin-iframe').attr('width', $("#modal-iframe-div").width());
+        $('#sakai-lti-admin-iframe').attr('height', modalDialogHeight()-50);
       });
     }
 
@@ -109,7 +109,7 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
                 if ( shortcut_tag ) {
                     var shortcut_href = shortcut_tag.getAttribute('href');
                     if ( shortcut_href ) {
-                        document.getElementById('sakai-basiclti-admin-iframe').src = shortcut_href;
+                        document.getElementById('sakai-lti-admin-iframe').src = shortcut_href;
                         showIframe();
                     }
                 }
diff --git a/lessonbuilder/tool/src/webapp/templates/LtiImportItem.html b/lessonbuilder/tool/src/webapp/templates/LtiImportItem.html
index 13672ea2d77a..6922a0af4bf5 100644
--- a/lessonbuilder/tool/src/webapp/templates/LtiImportItem.html
+++ b/lessonbuilder/tool/src/webapp/templates/LtiImportItem.html
@@ -30,7 +30,7 @@ <h2 rsf:id="mainhead" id="mainhead"></h2>
 
       <div rsf:id="blti-launch:" style="margin-left:2em">
         <i class="" rsf:id="blti-import-icon"></i>
-        <a href="#" target="sakai-basiclti-admin-iframe" onclick="showIframe(this.title, true);" rsf:id="blti-launch-link"></a>
+        <a href="#" target="sakai-lti-admin-iframe" onclick="showIframe(this.title, true);" rsf:id="blti-launch-link"></a>
       </div>
 
       <form action="#" rsf:id="blti-cancel" id="blti-cancel">
@@ -47,7 +47,7 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
               <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
-                    <iframe name="sakai-basiclti-admin-iframe" id="sakai-basiclti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
+                    <iframe name="sakai-lti-admin-iframe" id="sakai-lti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
             </div>
           </div>
         </div>
@@ -73,15 +73,15 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
       const modal = bootstrap.Modal.getOrCreateInstance(el);
 
       el.addEventListener("shown.bs.modal", e => {
-        $('#sakai-basiclti-admin-iframe').attr('width', $("#modal-iframe-div").width());
-        $('#sakai-basiclti-admin-iframe').attr('height', $("#modal-iframe-div").height()-10);
+        $('#sakai-lti-admin-iframe').attr('width', $("#modal-iframe-div").width());
+        $('#sakai-lti-admin-iframe').attr('height', $("#modal-iframe-div").height()-10);
       });
 
       el.addEventListener("hidden.bs.modal", e => {
         if ( exit ) {
            $( "#blti-cancel" ).submit();
         } else {
-          $('#sakai-basiclti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
+          $('#sakai-lti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
         }
       });
       modal.show();
@@ -89,8 +89,8 @@ <h5 class="modal-title" id="bltiModalLabel">Modal title</h5>
       $(window).resize(function() {
 
         // Note that width() gives the content width, taking into consideration the border, padding, etc.
-        $('#sakai-basiclti-admin-iframe').attr('width', $("#modal-iframe-div").width());
-        $('#sakai-basiclti-admin-iframe').attr('height', $("#modal-iframe-div").height()-10);
+        $('#sakai-lti-admin-iframe').attr('width', $("#modal-iframe-div").width());
+        $('#sakai-lti-admin-iframe').attr('height', $("#modal-iframe-div").height()-10);
       });
     }
 
diff --git a/library/pom.xml b/library/pom.xml
index 35b99a12af2e..def392639eb8 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -319,7 +319,7 @@
 			<artifactId>viewerjs</artifactId>
 			<version>0.5.9</version>
 		</dependency>
-		<!--Used in the BasicLTI and Site Manage-->
+		<!--Used in the LTI and Site Manage-->
 		<dependency>
 			<groupId>org.webjars.npm</groupId>
 			<artifactId>fontawesome-iconpicker</artifactId>
diff --git a/basiclti/.gitignore b/lti/.gitignore
similarity index 100%
rename from basiclti/.gitignore
rename to lti/.gitignore
diff --git a/basiclti/README.md b/lti/README.md
similarity index 91%
rename from basiclti/README.md
rename to lti/README.md
index 2e59f9de551e..2016047972a9 100644
--- a/basiclti/README.md
+++ b/lti/README.md
@@ -17,19 +17,19 @@ Aditional Documentation
 * [Using the IMS Reference Implementation with Sakai](docs/IMS_RI.md)
 * [Setting up Tsugi in Sakai for Testing](docs/TSUGI.md)
 * [Windows PostMessage Support in Sakai](docs/POSTMESSAGE.md)
-* [Sakai API Documentation Including API Extensions](docs/sakai_basiclti_api.md)
+* [Sakai API Documentation Including API Extensions](docs/sakai_lti_api.md)
 Sakai has API extensions for Membership/Roster, Learning Object Repository Integration, and a Settings service.
-* [Configuring the Sakai External Tools Portlet](docs/sakai_basiclti_portlet.md)
+* [Configuring the Sakai External Tools Portlet](docs/sakai_lti_portlet.md)
 It is possible to make multiple pre-configured placements of the LTI Tool in a way that they are placeable as tools.
-* [Configuring the Sakai LTI Provider](docs/sakai_basiclti_provider)
+* [Configuring the Sakai LTI Provider](docs/sakai_lti_provider)
 It is possible to use Sakai tools as LTI tools that can be used in an LTI Consumer like a portal or other LMS.
-* [Documentation for Vendors of Sakai Tools](docs/sakai_basiclti_vendor.md)
+* [Documentation for Vendors of Sakai Tools](docs/sakai_lti_vendor.md)
 This is CC0 licensed documenation that can be used to quickly develop vendor documnation showing how to configure a vendor's LTI
 tool in Sakai.
 
 Sakai QA Tests are available at:
 
-* [Sakai LTI Documentation](https://github.com/sakaiproject/sakai/tree/master/basiclti/basiclti-docs/resources/docs)
+* [Sakai LTI Documentation](https://github.com/sakaiproject/sakai/tree/master/lti/lti-docs/resources/docs)
 
 Sakai has an LTI 1.1 unit test that we keep up-to-date with the latest LTI specifications.  The
 test harness functions as both Consumer and Provider and exercises both standard services
@@ -41,7 +41,7 @@ Internal Documentation
 ----------------------
 
 # ######################################################
-# SAK-30601 - Upgraded BasicLTI dashboard
+# SAK-30601 - Upgraded LTI dashboard
 # ######################################################
 New Sakai properties added:
 --------------------------------------------------------------------------------
diff --git a/basiclti/docs/ASSIGNMENTS.md b/lti/docs/ASSIGNMENTS.md
similarity index 100%
rename from basiclti/docs/ASSIGNMENTS.md
rename to lti/docs/ASSIGNMENTS.md
diff --git a/basiclti/docs/CERTIFICATION.md b/lti/docs/CERTIFICATION.md
similarity index 100%
rename from basiclti/docs/CERTIFICATION.md
rename to lti/docs/CERTIFICATION.md
diff --git a/basiclti/docs/CERTIFICATION_22.pdf b/lti/docs/CERTIFICATION_22.pdf
similarity index 100%
rename from basiclti/docs/CERTIFICATION_22.pdf
rename to lti/docs/CERTIFICATION_22.pdf
diff --git a/basiclti/docs/CONTENTITEM.md b/lti/docs/CONTENTITEM.md
similarity index 96%
rename from basiclti/docs/CONTENTITEM.md
rename to lti/docs/CONTENTITEM.md
index 890f77ac7011..3addb32f3e04 100644
--- a/basiclti/docs/CONTENTITEM.md
+++ b/lti/docs/CONTENTITEM.md
@@ -123,11 +123,11 @@ Debugging Settings
 This is a useful set of debug classes for sakai.properties:
 
     log.config.count=5
-    log.config.1 = DEBUG.org.sakaiproject.basiclti.util.SakaiBLTIUtil
-    log.config.2 = DEBUG.org.sakaiproject.blti.tool.LTIAdminTool
+    log.config.1 = DEBUG.org.sakaiproject.lti.util.SakaiLTIUtil
+    log.config.2 = DEBUG.org.sakaiproject.lti.tool.LTIAdminTool
     log.config.3 = DEBUG.org.sakaiproject.lessonbuildertool.tool.producer.BltiPickerProducer
     log.config.4 = DEBUG.org.sakaiproject.lessonbuildertool.tool.producers.LtiFileItemProducer
-    log.config.5 = DEBUG.org.sakaiproject.blti.ProviderServlet
+    log.config.5 = DEBUG.org.sakaiproject.lti.ProviderServlet
 
 JIRA References
 ---------------
diff --git a/basiclti/docs/CUSTOM.md b/lti/docs/CUSTOM.md
similarity index 100%
rename from basiclti/docs/CUSTOM.md
rename to lti/docs/CUSTOM.md
diff --git a/basiclti/docs/IMG_IMS_RI/01-RI-Tool-Partial.png b/lti/docs/IMG_IMS_RI/01-RI-Tool-Partial.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/01-RI-Tool-Partial.png
rename to lti/docs/IMG_IMS_RI/01-RI-Tool-Partial.png
diff --git a/basiclti/docs/IMG_IMS_RI/02-RI-Tool-View.png b/lti/docs/IMG_IMS_RI/02-RI-Tool-View.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/02-RI-Tool-View.png
rename to lti/docs/IMG_IMS_RI/02-RI-Tool-View.png
diff --git a/basiclti/docs/IMG_IMS_RI/03-RI-Data-Copied.png b/lti/docs/IMG_IMS_RI/03-RI-Data-Copied.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/03-RI-Data-Copied.png
rename to lti/docs/IMG_IMS_RI/03-RI-Data-Copied.png
diff --git a/basiclti/docs/IMG_IMS_RI/11-Lessons-Add-External.png b/lti/docs/IMG_IMS_RI/11-Lessons-Add-External.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/11-Lessons-Add-External.png
rename to lti/docs/IMG_IMS_RI/11-Lessons-Add-External.png
diff --git a/basiclti/docs/IMG_IMS_RI/12-Lessons-Installed.png b/lti/docs/IMG_IMS_RI/12-Lessons-Installed.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/12-Lessons-Installed.png
rename to lti/docs/IMG_IMS_RI/12-Lessons-Installed.png
diff --git a/basiclti/docs/IMG_IMS_RI/13-Lessons-OIDC.png b/lti/docs/IMG_IMS_RI/13-Lessons-OIDC.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/13-Lessons-OIDC.png
rename to lti/docs/IMG_IMS_RI/13-Lessons-OIDC.png
diff --git a/basiclti/docs/IMG_IMS_RI/14-Lessons-Launched.png b/lti/docs/IMG_IMS_RI/14-Lessons-Launched.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/14-Lessons-Launched.png
rename to lti/docs/IMG_IMS_RI/14-Lessons-Launched.png
diff --git a/basiclti/docs/IMG_IMS_RI/21-Sakai-Tool-Checkboxes.png b/lti/docs/IMG_IMS_RI/21-Sakai-Tool-Checkboxes.png
similarity index 100%
rename from basiclti/docs/IMG_IMS_RI/21-Sakai-Tool-Checkboxes.png
rename to lti/docs/IMG_IMS_RI/21-Sakai-Tool-Checkboxes.png
diff --git a/basiclti/docs/IMG_PROVISION/01-Auto-Insert.png b/lti/docs/IMG_PROVISION/01-Auto-Insert.png
similarity index 100%
rename from basiclti/docs/IMG_PROVISION/01-Auto-Insert.png
rename to lti/docs/IMG_PROVISION/01-Auto-Insert.png
diff --git a/basiclti/docs/IMG_PROVISION/02-Auto-Update.png b/lti/docs/IMG_PROVISION/02-Auto-Update.png
similarity index 100%
rename from basiclti/docs/IMG_PROVISION/02-Auto-Update.png
rename to lti/docs/IMG_PROVISION/02-Auto-Update.png
diff --git a/basiclti/docs/IMG_TSUGI/01-Tsugi-Add-Issuer.png b/lti/docs/IMG_TSUGI/01-Tsugi-Add-Issuer.png
similarity index 100%
rename from basiclti/docs/IMG_TSUGI/01-Tsugi-Add-Issuer.png
rename to lti/docs/IMG_TSUGI/01-Tsugi-Add-Issuer.png
diff --git a/basiclti/docs/IMG_TSUGI/02-Post-Add.png b/lti/docs/IMG_TSUGI/02-Post-Add.png
similarity index 100%
rename from basiclti/docs/IMG_TSUGI/02-Post-Add.png
rename to lti/docs/IMG_TSUGI/02-Post-Add.png
diff --git a/basiclti/docs/IMG_TSUGI/03-Sakai-View-Tool.png b/lti/docs/IMG_TSUGI/03-Sakai-View-Tool.png
similarity index 100%
rename from basiclti/docs/IMG_TSUGI/03-Sakai-View-Tool.png
rename to lti/docs/IMG_TSUGI/03-Sakai-View-Tool.png
diff --git a/basiclti/docs/IMG_TSUGI/04-Tsugi-Add-Tenant.png b/lti/docs/IMG_TSUGI/04-Tsugi-Add-Tenant.png
similarity index 100%
rename from basiclti/docs/IMG_TSUGI/04-Tsugi-Add-Tenant.png
rename to lti/docs/IMG_TSUGI/04-Tsugi-Add-Tenant.png
diff --git a/basiclti/docs/IMG_TSUGI/05-LMSTest-Launch.png b/lti/docs/IMG_TSUGI/05-LMSTest-Launch.png
similarity index 100%
rename from basiclti/docs/IMG_TSUGI/05-LMSTest-Launch.png
rename to lti/docs/IMG_TSUGI/05-LMSTest-Launch.png
diff --git a/basiclti/docs/IMG_TSUGI/06-LMSTest-Migration.png b/lti/docs/IMG_TSUGI/06-LMSTest-Migration.png
similarity index 100%
rename from basiclti/docs/IMG_TSUGI/06-LMSTest-Migration.png
rename to lti/docs/IMG_TSUGI/06-LMSTest-Migration.png
diff --git a/basiclti/docs/IMPORTCC.md b/lti/docs/IMPORTCC.md
similarity index 100%
rename from basiclti/docs/IMPORTCC.md
rename to lti/docs/IMPORTCC.md
diff --git a/basiclti/docs/IMPORTLOR.md b/lti/docs/IMPORTLOR.md
similarity index 100%
rename from basiclti/docs/IMPORTLOR.md
rename to lti/docs/IMPORTLOR.md
diff --git a/basiclti/docs/IMS_RI.md b/lti/docs/IMS_RI.md
similarity index 100%
rename from basiclti/docs/IMS_RI.md
rename to lti/docs/IMS_RI.md
diff --git a/basiclti/docs/LTIROLES.md b/lti/docs/LTIROLES.md
similarity index 95%
rename from basiclti/docs/LTIROLES.md
rename to lti/docs/LTIROLES.md
index 408ea2ebf775..c6809b5db0d3 100644
--- a/basiclti/docs/LTIROLES.md
+++ b/lti/docs/LTIROLES.md
@@ -62,7 +62,7 @@ and the Names and Roles Service, Sakai 23 introduces default role mapping that s
 cover most common cases.
 
 The full default mappings are documented in
-[SakaiBLTIUtil.java](https://github.com/sakaiproject/sakai/blob/master/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java)
+[SakaiLTIUtil.java](https://github.com/sakaiproject/sakai/blob/master/lti/lti-common/src/java/org.sakaiproject.lti/util/SakaiLTIUtil.java)
 But here is a copy (may be out of date) so that we can talk about them.
 
     admin:Instructor,http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor,
@@ -100,7 +100,7 @@ These mappings in `sakai.properties` are one *very long* line with semicolon sep
 
 The precedence for applying outbound tool mappings from highest to lowest is: (a) The per-tool
 outbound mapping, (b) the role mapping from the `lti.outbound.role.map` and (c) the default
-role mapping in `SakaiBLTIUtil.java`.
+role mapping in `SakaiLTIUtil.java`.
 
 In general, it should be pretty rare when you need to override the default mapping.  If new use
 cases or new roles arise in LTI and see common use, we can add them to the default mapping
@@ -152,7 +152,7 @@ Note that `TeachingAssistant` is a little weird because it is a sub-type of `Ins
 use of a blank within Sakai and no blank in LTI.
 
 The actual default list is stored in
-[SakaiBLTIUtil.java](https://github.com/sakaiproject/sakai/blob/master/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java)
+[SakaiLTIUtil.java](https://github.com/sakaiproject/sakai/blob/master/lti/lti-common/src/java/org.sakaiproject.lti/util/SakaiLTIUtil.java)
 
 You can add new default mappings or override any or all of the mappings above through
 Sakai property:
@@ -199,7 +199,7 @@ these use cases out-of-the-box.
 
 Since Sakai is 100% open source, you could even improve Sakai yourself! :)  Simply go to:
 
-Source code: [SakaiBLTIUtil.java](https://github.com/sakaiproject/sakai/blob/master/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java)
+Source code: [SakaiLTIUtil.java](https://github.com/sakaiproject/sakai/blob/master/lti/lti-common/src/java/org.sakaiproject.lti/util/SakaiLTIUtil.java)
 
 If you have a github account and edit the file, you can send a "Pull Request" and become a Sakai
 contributor.
diff --git a/basiclti/docs/MIGRATION.md b/lti/docs/MIGRATION.md
similarity index 100%
rename from basiclti/docs/MIGRATION.md
rename to lti/docs/MIGRATION.md
diff --git a/basiclti/docs/PLACEMENTS.md b/lti/docs/PLACEMENTS.md
similarity index 100%
rename from basiclti/docs/PLACEMENTS.md
rename to lti/docs/PLACEMENTS.md
diff --git a/basiclti/docs/POSTMESSAGE.md b/lti/docs/POSTMESSAGE.md
similarity index 100%
rename from basiclti/docs/POSTMESSAGE.md
rename to lti/docs/POSTMESSAGE.md
diff --git a/basiclti/docs/PROVISION.md b/lti/docs/PROVISION.md
similarity index 100%
rename from basiclti/docs/PROVISION.md
rename to lti/docs/PROVISION.md
diff --git a/basiclti/docs/README.md b/lti/docs/README.md
similarity index 100%
rename from basiclti/docs/README.md
rename to lti/docs/README.md
diff --git a/basiclti/docs/TSUGI.md b/lti/docs/TSUGI.md
similarity index 100%
rename from basiclti/docs/TSUGI.md
rename to lti/docs/TSUGI.md
diff --git a/basiclti/docs/images/assignments/01-Tsugi-LineItem.png b/lti/docs/images/assignments/01-Tsugi-LineItem.png
similarity index 100%
rename from basiclti/docs/images/assignments/01-Tsugi-LineItem.png
rename to lti/docs/images/assignments/01-Tsugi-LineItem.png
diff --git a/basiclti/docs/sakai_lti_api.md b/lti/docs/sakai_lti_api.md
similarity index 98%
rename from basiclti/docs/sakai_lti_api.md
rename to lti/docs/sakai_lti_api.md
index 90be33988662..5155cc809a58 100644
--- a/basiclti/docs/sakai_lti_api.md
+++ b/lti/docs/sakai_lti_api.md
@@ -20,7 +20,7 @@ capabilities:
     outcomes in a standard cross-LMS manner.
 
 Several of these extensions APIs are implemented in the same fashion in
-the BasicLTI4Moodle, ATutor 2.0.2, and the Building Block and PowerLink
+the LTI4Moodle, ATutor 2.0.2, and the Building Block and PowerLink
 from SPV Software
 
 Testing/Sample Code
@@ -79,7 +79,7 @@ outcomes so unless you have added the properties, you should see a 403
 You should also see a warning message in the **catalina.out** file:
 
 2010-08-04 13:12:41,656 WARN http-8080-Processor21
-org.sakaiproject.blti.SimpleOutcomesServlet - LTI Outcomes are
+org.sakaiproject.lti.SimpleOutcomesServlet - LTI Outcomes are
 Disabled IP=0:0:0:0:0:0:0:1%0
 
 These two indicate that the LTI Outcomes is properly disabled in
diff --git a/basiclti/docs/sakai_lti_api/media/image1.png b/lti/docs/sakai_lti_api/media/image1.png
similarity index 100%
rename from basiclti/docs/sakai_lti_api/media/image1.png
rename to lti/docs/sakai_lti_api/media/image1.png
diff --git a/basiclti/docs/sakai_lti_api/media/image2.png b/lti/docs/sakai_lti_api/media/image2.png
similarity index 100%
rename from basiclti/docs/sakai_lti_api/media/image2.png
rename to lti/docs/sakai_lti_api/media/image2.png
diff --git a/basiclti/docs/sakai_lti_api/media/image3.png b/lti/docs/sakai_lti_api/media/image3.png
similarity index 100%
rename from basiclti/docs/sakai_lti_api/media/image3.png
rename to lti/docs/sakai_lti_api/media/image3.png
diff --git a/basiclti/docs/sakai_lti_api/media/image4.png b/lti/docs/sakai_lti_api/media/image4.png
similarity index 100%
rename from basiclti/docs/sakai_lti_api/media/image4.png
rename to lti/docs/sakai_lti_api/media/image4.png
diff --git a/basiclti/docs/sakai_lti_portlet.md b/lti/docs/sakai_lti_portlet.md
similarity index 98%
rename from basiclti/docs/sakai_lti_portlet.md
rename to lti/docs/sakai_lti_portlet.md
index 5968f615094e..360a64598662 100644
--- a/basiclti/docs/sakai_lti_portlet.md
+++ b/lti/docs/sakai_lti_portlet.md
@@ -203,7 +203,7 @@ students will see and use the tool like any other tool with no indicator
 that the tool is running outside Sakai.
 
 We create a virtual tool by editing the tool registration file -
-IMSBLTIPortlet.xml – this file contains the registration for the
+IMSLTIPortlet.xml – this file contains the registration for the
 External Tool as follows:
 
     <?xml version="1.0"?>
@@ -431,17 +431,17 @@ This provides a lot of flexibility in allowing the instructor to set
 **some** of the fields as determined by the LMS administrator.
 
 The additional tool registrations can be placed in the
-**IMSBLTIPortlet.xml** file in the LTI source tree or they can be
+**IMSLTIPortlet.xml** file in the LTI source tree or they can be
 placed in the **sakai.home** directory within your tomcat as follows:
 
-\${sakai.home}/portlets/imsblti/IMSBLTIPortlet.xml
+\${sakai.home}/portlets/imsblti/IMSLTIPortlet.xml
 
-\${sakai.home}/portlets/IMSBLTIPortlet.xml
+\${sakai.home}/portlets/IMSLTIPortlet.xml
 
 The path that includes the servlet name (**imsblti**) is the preferred
 location for the files. The name of the XML file must match the
 portlet's name as defined in the **portlet.xml** file. When either of
-these files is present, the I**MSBLTIPortlet.xml** file from the war is
+these files is present, the I**MSLTIPortlet.xml** file from the war is
 ignored.
 
 **Important Note:** When you create either of these files in
diff --git a/basiclti/docs/sakai_lti_portlet/media/image1.png b/lti/docs/sakai_lti_portlet/media/image1.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image1.png
rename to lti/docs/sakai_lti_portlet/media/image1.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image2.png b/lti/docs/sakai_lti_portlet/media/image2.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image2.png
rename to lti/docs/sakai_lti_portlet/media/image2.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image3.png b/lti/docs/sakai_lti_portlet/media/image3.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image3.png
rename to lti/docs/sakai_lti_portlet/media/image3.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image4.png b/lti/docs/sakai_lti_portlet/media/image4.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image4.png
rename to lti/docs/sakai_lti_portlet/media/image4.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image5.png b/lti/docs/sakai_lti_portlet/media/image5.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image5.png
rename to lti/docs/sakai_lti_portlet/media/image5.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image6.png b/lti/docs/sakai_lti_portlet/media/image6.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image6.png
rename to lti/docs/sakai_lti_portlet/media/image6.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image7.png b/lti/docs/sakai_lti_portlet/media/image7.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image7.png
rename to lti/docs/sakai_lti_portlet/media/image7.png
diff --git a/basiclti/docs/sakai_lti_portlet/media/image8.png b/lti/docs/sakai_lti_portlet/media/image8.png
similarity index 100%
rename from basiclti/docs/sakai_lti_portlet/media/image8.png
rename to lti/docs/sakai_lti_portlet/media/image8.png
diff --git a/basiclti/docs/sakai_lti_provider.md b/lti/docs/sakai_lti_provider.md
similarity index 96%
rename from basiclti/docs/sakai_lti_provider.md
rename to lti/docs/sakai_lti_provider.md
index 43a93eedb936..458891c46725 100644
--- a/basiclti/docs/sakai_lti_provider.md
+++ b/lti/docs/sakai_lti_provider.md
@@ -135,12 +135,12 @@ http://trunk-maria.nightly.sakaiproject.org/imsblti/provider/sakai.rwiki
 You should also see log messages indicating the creation of the user,
 site, and tool as follows:
 
-    INFO http-8080-Processor25 org.sakaiproject.blti.ProviderServlet -
+    INFO http-8080-Processor25 org.sakaiproject.lti.ProviderServlet -
     Created user=lmsng.school.edu:292832126
-    INFO http-8080-Processor25 org.sakaiproject.blti.ProviderServlet -
+    INFO http-8080-Processor25 org.sakaiproject.lti.ProviderServlet -
     Created site=lmsng.school.edu:456434513 label=SI182 type=project
     title=Design of Personal Environments
-    INFO http-8080-Processor25 org.sakaiproject.blti.ProviderServlet - Tool
+    INFO http-8080-Processor25 org.sakaiproject.lti.ProviderServlet - Tool
     added site=lmsng.school.edu:456434513 tool\_id=sakai.rwiki
 
 Using this approach you can plug Sakai tools into any LMS, portal or
@@ -162,7 +162,7 @@ You should see a 403 (Forbidden) message as shown below:
 
 You should also see a warning message in the `catalina.out` file:
 
-WARN http-8080-Processor25 org.sakaiproject.blti.ProviderServlet - LTI
+WARN http-8080-Processor25 org.sakaiproject.lti.ProviderServlet - LTI
 Provider is Disabled IP=0:0:0:0:0:0:0:1%0
 
 These two indicate that the LTI Tool Provider is properly disabled in
@@ -220,7 +220,7 @@ Management Systems using the LTI standard.
 The code for the LTI Tool Provider for Sakai is relatively
 straightforward and is completely contained in:
 
-basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java
+lti-portlet/src/java/org.sakaiproject.lti/ProviderServlet.java
 
 The code supports the "Sakai Tool Appliance" use case out of the box.
 However if organizations want to add or change business rules based on
diff --git a/basiclti/docs/sakai_lti_provider/media/image1.png b/lti/docs/sakai_lti_provider/media/image1.png
similarity index 100%
rename from basiclti/docs/sakai_lti_provider/media/image1.png
rename to lti/docs/sakai_lti_provider/media/image1.png
diff --git a/basiclti/docs/sakai_lti_provider/media/image2.png b/lti/docs/sakai_lti_provider/media/image2.png
similarity index 100%
rename from basiclti/docs/sakai_lti_provider/media/image2.png
rename to lti/docs/sakai_lti_provider/media/image2.png
diff --git a/basiclti/docs/sakai_lti_provider/media/image3.png b/lti/docs/sakai_lti_provider/media/image3.png
similarity index 100%
rename from basiclti/docs/sakai_lti_provider/media/image3.png
rename to lti/docs/sakai_lti_provider/media/image3.png
diff --git a/basiclti/docs/sakai_lti_provider/media/image4.png b/lti/docs/sakai_lti_provider/media/image4.png
similarity index 100%
rename from basiclti/docs/sakai_lti_provider/media/image4.png
rename to lti/docs/sakai_lti_provider/media/image4.png
diff --git a/basiclti/docs/sakai_lti_vendor.md b/lti/docs/sakai_lti_vendor.md
similarity index 95%
rename from basiclti/docs/sakai_lti_vendor.md
rename to lti/docs/sakai_lti_vendor.md
index 2fd5d60e356b..4595feaa61c5 100644
--- a/basiclti/docs/sakai_lti_vendor.md
+++ b/lti/docs/sakai_lti_vendor.md
@@ -28,7 +28,7 @@ vendor.
 
 If you want more detail, you can see the file:
 
-basiclti/basiclti-docs/resources/docs/sakai\_basiclti\_portlet.doc
+basiclti/lti-docs/resources/docs/sakai\_basiclti\_portlet.doc
 
 Which give you a more in-depth description of the options available
 when pre-configuring LTI tools in Sakai.
@@ -58,11 +58,11 @@ The Sakai tool registration process reads an XML document to create as
 many pre-configured LTI tools as you like. The default LTI
 tool registration is in the source tree at the following location:
 
-basiclti/basiclti-portlet/src/webapp/WEB-INF/sakai/IMSBLTIPortlet.xml
+basiclti/lti-portlet/src/webapp/WEB-INF/sakai/IMSLTIPortlet.xml
 
 The exact same file is also in your deployed Apache Tomcat at
 
-webapps/imsblti/WEB-INF/sakai/IMSBLTIPortlet.xml
+webapps/imsblti/WEB-INF/sakai/IMSLTIPortlet.xml
 
 The first step is to make a copy of this file into your **sakai.home**
 folder. Normally this folder is in your deployed Tomcat in the directory
@@ -72,7 +72,7 @@ file is stored.
 You need to make a copy of this file in your **sakai.home** folder under
 the following path
 
-\$TOMCAT\_HOME/sakai/portlets/imsblti/IMSBLTIPortlet.xml
+\$TOMCAT\_HOME/sakai/portlets/imsblti/IMSLTIPortlet.xml
 
 The portlets folder should be in the same directory as your
 **sakai.properties** file resides.
@@ -83,7 +83,7 @@ to install. If you look in **sakai.home** and find this file is already
 there, all that is necessary is to add a new tool registration XML to
 the existing file.
 
-Once the copy of the **IMSBLTIPortlet.xml** file is properly placed in
+Once the copy of the **IMSLTIPortlet.xml** file is properly placed in
 the **sakai.home** folder, it *overrides* the copy in the **imsblti**
 webapp. So you need to maintain the existing **sakai.basiclti** tool
 registration in the new copy of the file unless you explicitly intend to
@@ -92,7 +92,7 @@ not provide a generic LTI tool for your users.
 The Tool Registration File
 ==========================
 
-The default **IMSBLTIPortlet.xml** file contains the registration for
+The default **IMSLTIPortlet.xml** file contains the registration for
 the LTI Tool and looks as follows.
 
     <?xml version="1.0"?>
@@ -178,7 +178,7 @@ properties – or lock-down most of the properties.
 Adding the IMS LTI Test Tool to your System
 =================================================
 
-Once you have made a copy of the **IMSBLTIPortlet.xml** file, we simply
+Once you have made a copy of the **IMSLTIPortlet.xml** file, we simply
 need to add the new tool registration for the IMS LTI Test Tool.
 The following is an example of the additional tool registration to be
 inserted as indicated above.
@@ -196,7 +196,7 @@ inserted as indicated above.
                 <configuration name="functions.require" />
 
                 <configuration name="imsti.launch"
-                   value="http://www.imsglobal.org/developers/BLTI/tool.php" />
+                   value="http://www.imsglobal.org/developers/LTI/tool.php" />
                 <configuration name="imsti.xml" />
                 <configuration name="imsti.secret" value="secret" />
                 <configuration name="imsti.key" value="lmsng.school.edu" />
@@ -255,7 +255,7 @@ will not be allowed to give them a value in their configuration screen.
 Testing Your New Tool
 =====================
 
-Once you have made a copy of the **IMSBLTIPortlet.xml** file into the
+Once you have made a copy of the **IMSLTIPortlet.xml** file into the
 appropriate location in the **sakai.home** folder (if necessary) and
 added the new tool registration XML to the file, you can restart your
 Sakai and test the new tool.
diff --git a/basiclti/docs/sakai_lti_vendor/media/image1.png b/lti/docs/sakai_lti_vendor/media/image1.png
similarity index 100%
rename from basiclti/docs/sakai_lti_vendor/media/image1.png
rename to lti/docs/sakai_lti_vendor/media/image1.png
diff --git a/basiclti/docs/sakai_lti_vendor/media/image2.png b/lti/docs/sakai_lti_vendor/media/image2.png
similarity index 100%
rename from basiclti/docs/sakai_lti_vendor/media/image2.png
rename to lti/docs/sakai_lti_vendor/media/image2.png
diff --git a/basiclti/basiclti-api/pom.xml b/lti/lti-api/pom.xml
similarity index 81%
rename from basiclti/basiclti-api/pom.xml
rename to lti/lti-api/pom.xml
index e7de75689cc6..de19629541fa 100644
--- a/basiclti/basiclti-api/pom.xml
+++ b/lti/lti-api/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
-    <name>LTI API (basiclti-api)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti-api</artifactId>
+    <name>LTI API (lti-api)</name>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti-api</artifactId>
     <packaging>jar</packaging>
     
     <properties>
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ar.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ar.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ar.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ar.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_bg.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_bg.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_bg.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_bg.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ca.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ca.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ca.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ca.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_de_DE.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_de_DE.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_de_DE.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_es.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_es.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_es.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_es.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_eu.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_eu.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_eu.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_eu.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fa_IR.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fa_IR.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fa_IR.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fr_FR.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fr_FR.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_fr_FR.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ja.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ja.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ja.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ja.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ro_RO.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ro_RO.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_ro_RO.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_sr.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_sr.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_sr.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_sr.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_tr_TR.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_tr_TR.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_tr_TR.properties
diff --git a/basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_zh_CN.properties b/lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_zh_CN.properties
rename to lti/lti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_zh_CN.properties
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/AbstractBLTIProcessor.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/AbstractLTIProcessor.java
similarity index 97%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/AbstractBLTIProcessor.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/AbstractLTIProcessor.java
index 7b8ffeec46c7..c0ea195f5d08 100644
--- a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/AbstractBLTIProcessor.java
+++ b/lti/lti-api/src/java/org/sakaiproject/lti/api/AbstractLTIProcessor.java
@@ -27,7 +27,7 @@
  * Time: 3:53 PM
  * To change this template use File | Settings | File Templates.
  */
-public class AbstractBLTIProcessor implements BLTIProcessor {
+public class AbstractLTIProcessor implements LTIProcessor {
 
 
     public int getOrder() {
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIException.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIException.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIException.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTIException.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIExportService.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIExportService.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIExportService.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTIExportService.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIExporter.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIExporter.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIExporter.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTIExporter.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/BLTIProcessor.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIProcessor.java
similarity index 98%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/BLTIProcessor.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTIProcessor.java
index 55d779b0d6ba..3ce4a9121926 100644
--- a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/BLTIProcessor.java
+++ b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIProcessor.java
@@ -27,7 +27,7 @@
  * Time: 3:44 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface BLTIProcessor {
+public interface LTIProcessor {
     public int getOrder();
     public void beforeValidation(Map payload, boolean trustedConsumer) throws LTIException;
     public void afterValidation(Map payload, boolean trustedConsumer) throws LTIException;
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIRoleMapper.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIRoleMapper.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIRoleMapper.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTIRoleMapper.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTISearchData.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTISearchData.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTISearchData.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTISearchData.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIService.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIService.java
similarity index 99%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIService.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTIService.java
index 7c43dba25d9d..4ff1d191a42a 100644
--- a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIService.java
+++ b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTIService.java
@@ -40,7 +40,7 @@ public interface LTIService extends LTISubstitutionsFilter {
     /** Constants */
     String ADMIN_SITE = "!admin";
     String LAUNCH_PREFIX = "/access/lti/site/";
-    String LAUNCH_PREFIX_LEGACY = "/access/basiclti/site/";
+    String LAUNCH_PREFIX_LEGACY = "/access/lti/site/";
 
     /**
      * This string starts the references to resources in this service.
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTISubstitutionsFilter.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/LTISubstitutionsFilter.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTISubstitutionsFilter.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/LTISubstitutionsFilter.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/SiteEmailPreferenceSetter.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/SiteEmailPreferenceSetter.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/SiteEmailPreferenceSetter.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/SiteEmailPreferenceSetter.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/SiteMembershipUpdater.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/SiteMembershipUpdater.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/SiteMembershipUpdater.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/SiteMembershipUpdater.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/SiteMembershipsSynchroniser.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/SiteMembershipsSynchroniser.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/SiteMembershipsSynchroniser.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/SiteMembershipsSynchroniser.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserFinderOrCreator.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/UserFinderOrCreator.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserFinderOrCreator.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/UserFinderOrCreator.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserLocaleSetter.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/UserLocaleSetter.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserLocaleSetter.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/UserLocaleSetter.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserPictureSetter.java b/lti/lti-api/src/java/org/sakaiproject/lti/api/UserPictureSetter.java
similarity index 93%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserPictureSetter.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/api/UserPictureSetter.java
index 1ad2b3ad824b..6bbe0d307029 100644
--- a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/UserPictureSetter.java
+++ b/lti/lti-api/src/java/org/sakaiproject/lti/api/UserPictureSetter.java
@@ -26,7 +26,7 @@
 public interface UserPictureSetter {
 
     /**
-     * BLTI-155. If Profile2 is installed, set the profile picture to the user_image url, if supplied.
+     * LTI-155. If Profile2 is installed, set the profile picture to the user_image url, if supplied.
      * 
      * @param payload The LTI launch parameters in a Map
      * @param user The provisioned user who MUST be already logged in.
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/extensions/POXMembershipsResponse.java b/lti/lti-api/src/java/org/sakaiproject/lti/extensions/POXMembershipsResponse.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/lti/extensions/POXMembershipsResponse.java
rename to lti/lti-api/src/java/org/sakaiproject/lti/extensions/POXMembershipsResponse.java
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/util/foorm/FoormUtil.java b/lti/lti-api/src/java/org/sakaiproject/util/foorm/FoormUtil.java
similarity index 100%
rename from basiclti/basiclti-api/src/java/org/sakaiproject/util/foorm/FoormUtil.java
rename to lti/lti-api/src/java/org/sakaiproject/util/foorm/FoormUtil.java
diff --git a/basiclti/basiclti-blis/maven.xml b/lti/lti-blis/maven.xml
similarity index 100%
rename from basiclti/basiclti-blis/maven.xml
rename to lti/lti-blis/maven.xml
diff --git a/basiclti/basiclti-blis/pom.xml b/lti/lti-blis/pom.xml
similarity index 93%
rename from basiclti/basiclti-blis/pom.xml
rename to lti/lti-blis/pom.xml
index c2ce5cf3e4d0..44d233bd153a 100644
--- a/basiclti/basiclti-blis/pom.xml
+++ b/lti/lti-blis/pom.xml
@@ -3,28 +3,28 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
     <name>BasicLIS Implementation (imsblis)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
+    <groupId>org.sakaiproject.lti</groupId>
     <artifactId>imsblis</artifactId>
     <packaging>war</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/basiclti/basiclti-blis/src/bundle/blis.properties b/lti/lti-blis/src/bundle/blis.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis.properties
rename to lti/lti-blis/src/bundle/blis.properties
index 86a4d0c08339..f0af763abd09 100644
--- a/basiclti/basiclti-blis/src/bundle/blis.properties
+++ b/lti/lti-blis/src/bundle/blis.properties
@@ -21,7 +21,7 @@ deploy.register.signature=OAuth signature failure
 deploy.register.parse=JSON parse failed
 deploy.register.notools=No tools found in profile
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=Unable to determine launch URL
 deploy.register.messages=A resource_handler cannot have more than one basic-lti-launch-request message
diff --git a/basiclti/basiclti-blis/src/bundle/blis_ar.properties b/lti/lti-blis/src/bundle/blis_ar.properties
similarity index 99%
rename from basiclti/basiclti-blis/src/bundle/blis_ar.properties
rename to lti/lti-blis/src/bundle/blis_ar.properties
index 2c466338cb72..d361595187ec 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_ar.properties
+++ b/lti/lti-blis/src/bundle/blis_ar.properties
@@ -21,7 +21,7 @@ deploy.register.signature=\u0641\u0634\u0644 \u062a\u0648\u0642\u064a\u0639 OAut
 deploy.register.parse=\u0641\u0634\u0644 \u062a\u062d\u0644\u064a\u0644 JSON
 deploy.register.notools=\u0644\u0645 \u064a\u062a\u0645 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0623\u062f\u0648\u0627\u062a \u0641\u064a \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=\u062a\u0639\u0630\u0631 \u062a\u062d\u062f\u064a\u062f \u0639\u0646\u0648\u0627\u0646 URL \u0627\u0644\u062e\u0627\u0635 \u0628\u0627\u0644\u062a\u0634\u063a\u064a\u0644
 deploy.register.messages=\u0644\u0627 \u064a\u0645\u0643\u0646 \u0623\u0646 \u064a\u062d\u062a\u0648\u064a \u0645\u0639\u0627\u0644\u062c \u0627\u0644\u0645\u0648\u0627\u0631\u062f \u0639\u0644\u0649 \u0623\u0643\u062b\u0631 \u0645\u0646 \u0631\u0633\u0627\u0644\u0629 \u0637\u0644\u0628 \u062a\u0634\u063a\u064a\u0644 \u0623\u0633\u0627\u0633\u064a\u0629 \u0648\u0627\u062d\u062f\u0629
diff --git a/basiclti/basiclti-blis/src/bundle/blis_bg.properties b/lti/lti-blis/src/bundle/blis_bg.properties
similarity index 99%
rename from basiclti/basiclti-blis/src/bundle/blis_bg.properties
rename to lti/lti-blis/src/bundle/blis_bg.properties
index 48fc8b3aee45..5a5ecb3048e6 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_bg.properties
+++ b/lti/lti-blis/src/bundle/blis_bg.properties
@@ -21,7 +21,7 @@ deploy.register.signature=\u041d\u0435\u0443\u0441\u043f\u0435\u0445 \u043f\u044
 deploy.register.parse=\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u0435\u043d \u0440\u0430\u0437\u0431\u043e\u0440 \u043d\u0430 JSON
 deploy.register.notools=\u0412 \u043f\u0440\u043e\u0444\u0438\u043b\u0430 \u043d\u0435 \u0441\u0430 \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442 \u0437\u0430 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u043d\u0435 \u043d\u0430 URL \u0430\u0434\u0440\u0435\u0441\u0430 \u0437\u0430 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435
 deploy.register.messages=\u0415\u0434\u0438\u043d resource_handler \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0438\u043c\u0430 \u043f\u043e\u0432\u0435\u0447\u0435 \u043e\u0442 \u0435\u0434\u043d\u043e \u0441\u044a\u043e\u0431\u0449\u0435\u043d\u0438\u0435 basic-lti-launch-request
diff --git a/basiclti/basiclti-blis/src/bundle/blis_ca.properties b/lti/lti-blis/src/bundle/blis_ca.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_ca.properties
rename to lti/lti-blis/src/bundle/blis_ca.properties
index 56367ad1f8fa..6a96685a3b7c 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_ca.properties
+++ b/lti/lti-blis/src/bundle/blis_ca.properties
@@ -21,7 +21,7 @@ deploy.register.signature=Fallida en la signatura OAuth
 deploy.register.parse=Ha fallat el tractament del JSON
 deploy.register.notools=No s\u2019han trobat eines al perfil
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=No es possible determinar l\u2019adre\u00e7a URL
 deploy.register.messages=Un resource_handler no ot tenir m\u00e9s d\u2019un missatge basic-lti-launch-request
diff --git a/basiclti/basiclti-blis/src/bundle/blis_de_DE.properties b/lti/lti-blis/src/bundle/blis_de_DE.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_de_DE.properties
rename to lti/lti-blis/src/bundle/blis_de_DE.properties
index e9c765d4d39d..53828719b462 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_de_DE.properties
+++ b/lti/lti-blis/src/bundle/blis_de_DE.properties
@@ -18,7 +18,7 @@ deploy.register.credentials=Deployment is missing credentials
 deploy.register.signature=OAuth signature failure
 deploy.register.parse=JSON parse failed
 deploy.register.notools=No tools found in profile
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 deploy.register.launch=Unable to determine launch URL
 deploy.register.messages=A resource_handler cannot have more than one basic-lti-launch-request message
 deploy.register.nopath=A basic-lti-launch-request message must have a path
diff --git a/basiclti/basiclti-blis/src/bundle/blis_es.properties b/lti/lti-blis/src/bundle/blis_es.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_es.properties
rename to lti/lti-blis/src/bundle/blis_es.properties
index dd69d81a3a85..d272a7b0cfa3 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_es.properties
+++ b/lti/lti-blis/src/bundle/blis_es.properties
@@ -21,7 +21,7 @@ deploy.register.signature=Falta de firma OAuth
 deploy.register.parse=Fallo al analizar el JSON
 deploy.register.notools=No se han encontrado herramientas en el perfil
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=No se pudo determinar el lanzamiento de la URL
 deploy.register.messages=Un resource_handler no puede tener m\u00e1s de un mensaje de solicitud de lanzamiento basic-lti
diff --git a/basiclti/basiclti-blis/src/bundle/blis_eu.properties b/lti/lti-blis/src/bundle/blis_eu.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_eu.properties
rename to lti/lti-blis/src/bundle/blis_eu.properties
index 9334e178e62e..e71fc612fdba 100755
--- a/basiclti/basiclti-blis/src/bundle/blis_eu.properties
+++ b/lti/lti-blis/src/bundle/blis_eu.properties
@@ -21,7 +21,7 @@ deploy.register.signature=OAuth signature failure
 deploy.register.parse=JSON parse failed
 deploy.register.notools=No tools found in profile
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=Unable to determine launch URL
 deploy.register.messages=A resource_handler cannot have more than one basic-lti-launch-request message
diff --git a/basiclti/basiclti-blis/src/bundle/blis_fa_IR.properties b/lti/lti-blis/src/bundle/blis_fa_IR.properties
similarity index 98%
rename from basiclti/basiclti-blis/src/bundle/blis_fa_IR.properties
rename to lti/lti-blis/src/bundle/blis_fa_IR.properties
index 4271ce999054..dcc96dc9b37f 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_fa_IR.properties
+++ b/lti/lti-blis/src/bundle/blis_fa_IR.properties
@@ -19,7 +19,7 @@ deploy.register.signature=\u062e\u0637\u0627 \u062f\u0631 \u0627\u0645\u0636\u06
 deploy.register.parse=JSON parse \u0627\u0646\u062c\u0627\u0645 \u0646\u0634\u062f
 deploy.register.notools=\u0647\u06cc\u0686 \u0627\u0628\u0632\u0627\u0631\u06cc \u062f\u0631 \u067e\u0631\u0648\u0641\u0627\u06cc\u0644 \u06cc\u0627\u0641\u062a \u0646\u0634\u062f
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=\u062a\u0634\u062e\u06cc\u0635 URL \u0627\u062c\u0631\u0627 \u0645\u0648\u0641\u0642\u06cc\u062a\u200c\u0622\u0645\u06cc\u0632 \u0646\u0628\u0648\u062f
 deploy.register.messages=\u06cc\u06a9 resource_handler \u0646\u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u062f \u0628\u06cc\u0634 \u0627\u0632 \u06cc\u06a9 \u067e\u06cc\u0627\u0645 basic-lti-launch-request \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f
diff --git a/basiclti/basiclti-blis/src/bundle/blis_fr_FR.properties b/lti/lti-blis/src/bundle/blis_fr_FR.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_fr_FR.properties
rename to lti/lti-blis/src/bundle/blis_fr_FR.properties
index fda611b88912..e8a15c8c7427 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_fr_FR.properties
+++ b/lti/lti-blis/src/bundle/blis_fr_FR.properties
@@ -21,7 +21,7 @@ deploy.register.signature=\u00c9chec de signature OAuth
 deploy.register.parse=L'analyse JSON a \u00e9chou\u00e9
 deploy.register.notools=Aucun outil trouv\u00e9 dans le profil
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=Impossible de d\u00e9terminer l'URL de lancement
 deploy.register.messages=A resource_handler cannot have more than one basic-lti-launch-request message
diff --git a/basiclti/basiclti-blis/src/bundle/blis_hi_IN.properties b/lti/lti-blis/src/bundle/blis_hi_IN.properties
similarity index 99%
rename from basiclti/basiclti-blis/src/bundle/blis_hi_IN.properties
rename to lti/lti-blis/src/bundle/blis_hi_IN.properties
index 8910c631790e..c32d95c4cf3c 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_hi_IN.properties
+++ b/lti/lti-blis/src/bundle/blis_hi_IN.properties
@@ -19,7 +19,7 @@ deploy.register.signature=OAuth \u0939\u0938\u094d\u0924\u093e\u0915\u094d\u0937
 deploy.register.parse=JSON \u092a\u093e\u0930\u094d\u0938 \u092e\u0947\u0902 \u0935\u093f\u092b\u0932 \u0930\u0939\u093e
 deploy.register.notools=\u092a\u094d\u0930\u094b\u092b\u093e\u0907\u0932 \u092e\u0947\u0902 \u0915\u094b\u0908 \u0909\u092a\u0915\u0930\u0923 \u0928\u0939\u0940\u0902 \u0939\u0948
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=\u0932\u093e\u0902\u091a URL \u0928\u093f\u0930\u094d\u0927\u093e\u0930\u093f\u0924 \u0915\u0930\u0928\u0947 \u092e\u0947\u0902 \u0905\u0938\u092e\u0930\u094d\u0925
 deploy.register.messages=\u090f\u0915 resource_handler \u092e\u0947 \u090f\u0915 \u0938\u0947 \u0905\u0927\u093f\u0915 \u092c\u0941\u0928\u093f\u092f\u093e\u0926\u0940 lti-\u092a\u094d\u0930\u0915\u094d\u0937\u0947\u092a\u0923-\u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0902\u0926\u0947\u0936 \u0928\u0939\u0940\u0902 \u0939\u094b \u0938\u0915\u0924\u093e 
diff --git a/basiclti/basiclti-blis/src/bundle/blis_ja.properties b/lti/lti-blis/src/bundle/blis_ja.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/blis_ja.properties
rename to lti/lti-blis/src/bundle/blis_ja.properties
diff --git a/basiclti/basiclti-blis/src/bundle/blis_mn.properties b/lti/lti-blis/src/bundle/blis_mn.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/blis_mn.properties
rename to lti/lti-blis/src/bundle/blis_mn.properties
diff --git a/basiclti/basiclti-blis/src/bundle/blis_pt_BR.properties b/lti/lti-blis/src/bundle/blis_pt_BR.properties
similarity index 95%
rename from basiclti/basiclti-blis/src/bundle/blis_pt_BR.properties
rename to lti/lti-blis/src/bundle/blis_pt_BR.properties
index a4004de3a1ff..49c9eaa27511 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_pt_BR.properties
+++ b/lti/lti-blis/src/bundle/blis_pt_BR.properties
@@ -20,7 +20,7 @@ deploy.register.signature=Falha na assinatura OAuth
 deploy.register.parse=Falha ao analisar JSON 
 deploy.register.notools=Nenhuma ferramenta encontrada no perfil
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=N\u00E3o foi poss\u00edvel determinar o in\u00edcio da URL
 deploy.register.messages=Um resource_handler n\u00e3o pode ter mais de uma mensagem de requisi\u00e7\u00e3o de inicializa\u00e7\u00e3o basic-lti
diff --git a/basiclti/basiclti-blis/src/bundle/blis_ro_RO.properties b/lti/lti-blis/src/bundle/blis_ro_RO.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_ro_RO.properties
rename to lti/lti-blis/src/bundle/blis_ro_RO.properties
index a2077e554804..916fbe234b35 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_ro_RO.properties
+++ b/lti/lti-blis/src/bundle/blis_ro_RO.properties
@@ -21,7 +21,7 @@ deploy.register.signature=Eroare semnatura OAuth
 deploy.register.parse=Eroare parcurgere JSON
 deploy.register.notools=Nu s-au gasit instrumente in profil
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=Nu s-a putut determina URL-ul de lansare
 deploy.register.messages=Un manipulant_de resurse nu poate avea mai multe mesaje de tip solicitare-lansare-lti-de baza
diff --git a/basiclti/basiclti-blis/src/bundle/blis_sr.properties b/lti/lti-blis/src/bundle/blis_sr.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_sr.properties
rename to lti/lti-blis/src/bundle/blis_sr.properties
index 57a6e626987e..8c0b0a080c9f 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_sr.properties
+++ b/lti/lti-blis/src/bundle/blis_sr.properties
@@ -21,7 +21,7 @@ deploy.register.signature=OAuth kvar prilikom potpisa
 deploy.register.parse=JSON ra\u0161\u010dlanjivanje nije uspelo
 deploy.register.notools=Nisu otkriveni nikakvi alati u profilu
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=Nemogu\u0107nost utvr\u0111ivanja URL pokretanja
 deploy.register.messages=resource_handler ne mo\u017ee da ima vi\u0161e od jedne basic-lti-launch-request poruke
diff --git a/basiclti/basiclti-blis/src/bundle/blis_tr_TR.properties b/lti/lti-blis/src/bundle/blis_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/blis_tr_TR.properties
rename to lti/lti-blis/src/bundle/blis_tr_TR.properties
diff --git a/basiclti/basiclti-blis/src/bundle/blis_zh_CN.properties b/lti/lti-blis/src/bundle/blis_zh_CN.properties
similarity index 97%
rename from basiclti/basiclti-blis/src/bundle/blis_zh_CN.properties
rename to lti/lti-blis/src/bundle/blis_zh_CN.properties
index 654d5881781c..0925b861cc12 100644
--- a/basiclti/basiclti-blis/src/bundle/blis_zh_CN.properties
+++ b/lti/lti-blis/src/bundle/blis_zh_CN.properties
@@ -18,7 +18,7 @@ deploy.register.signature=OAuth\u7B7E\u540D\u5931\u8D25
 deploy.register.parse=JSON\u89E3\u6790\u5931\u8D25
 deploy.register.notools=Profile\u4E2D\u6CA1\u6709\u5DE5\u5177
 
-# from BasicLTIUtil.parseToolProfile
+# from LTIUtil.parseToolProfile
 
 deploy.register.launch=\u65E0\u6CD5\u786E\u5B9A\u51FA\u53D1URL
 deploy.register.messages=resource_handler\u4E0D\u80FD\u6709\u591A\u4E2Abasic-lti-launch-request
diff --git a/basiclti/basiclti-blis/src/bundle/lti.properties b/lti/lti-blis/src/bundle/lti.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti.properties
rename to lti/lti-blis/src/bundle/lti.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_ar.properties b/lti/lti-blis/src/bundle/lti_ar.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_ar.properties
rename to lti/lti-blis/src/bundle/lti_ar.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_bg.properties b/lti/lti-blis/src/bundle/lti_bg.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_bg.properties
rename to lti/lti-blis/src/bundle/lti_bg.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_ca.properties b/lti/lti-blis/src/bundle/lti_ca.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_ca.properties
rename to lti/lti-blis/src/bundle/lti_ca.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_de_DE.properties b/lti/lti-blis/src/bundle/lti_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_de_DE.properties
rename to lti/lti-blis/src/bundle/lti_de_DE.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_es.properties b/lti/lti-blis/src/bundle/lti_es.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_es.properties
rename to lti/lti-blis/src/bundle/lti_es.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_eu.properties b/lti/lti-blis/src/bundle/lti_eu.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_eu.properties
rename to lti/lti-blis/src/bundle/lti_eu.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_fa_IR.properties b/lti/lti-blis/src/bundle/lti_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_fa_IR.properties
rename to lti/lti-blis/src/bundle/lti_fa_IR.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_fr_FR.properties b/lti/lti-blis/src/bundle/lti_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_fr_FR.properties
rename to lti/lti-blis/src/bundle/lti_fr_FR.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_ja.properties b/lti/lti-blis/src/bundle/lti_ja.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_ja.properties
rename to lti/lti-blis/src/bundle/lti_ja.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_ro_RO.properties b/lti/lti-blis/src/bundle/lti_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_ro_RO.properties
rename to lti/lti-blis/src/bundle/lti_ro_RO.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_sr.properties b/lti/lti-blis/src/bundle/lti_sr.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_sr.properties
rename to lti/lti-blis/src/bundle/lti_sr.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_tr_TR.properties b/lti/lti-blis/src/bundle/lti_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_tr_TR.properties
rename to lti/lti-blis/src/bundle/lti_tr_TR.properties
diff --git a/basiclti/basiclti-blis/src/bundle/lti_zh_CN.properties b/lti/lti-blis/src/bundle/lti_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-blis/src/bundle/lti_zh_CN.properties
rename to lti/lti-blis/src/bundle/lti_zh_CN.properties
diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java b/lti/lti-blis/src/java/org/sakaiproject/lti/ServiceServlet.java
similarity index 84%
rename from basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java
rename to lti/lti-blis/src/java/org/sakaiproject/lti/ServiceServlet.java
index 01be35e3a7dd..afd06c37c175 100644
--- a/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java
+++ b/lti/lti-blis/src/java/org/sakaiproject/lti/ServiceServlet.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sakaiproject.blti;
+package org.sakaiproject.lti;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -49,17 +49,17 @@
 import net.oauth.server.OAuthServlet;
 import net.oauth.signature.OAuthSignatureMethod;
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
-import org.tsugi.basiclti.XMLMap;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
+import org.tsugi.lti.XMLMap;
 import org.tsugi.pox.IMSPOXRequest;
 import org.tsugi.lti13.LTI13ConstantsUtil;
 
 import org.sakaiproject.authz.api.AuthzGroupService;
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;
-import org.sakaiproject.basiclti.util.LegacyShaUtil;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.LegacyShaUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.lti.api.LTIService;
@@ -72,11 +72,11 @@
 import org.sakaiproject.util.ResourceLoader;
 import org.sakaiproject.util.api.FormattedText;
 
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_ALLOWROSTER;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_ON;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_OFF;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_TOOLSETTING;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_ASSIGNMENT;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_ALLOWROSTER;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_ON;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_OFF;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_TOOLSETTING;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_ASSIGNMENT;
 
 /**
  * Notes:
@@ -155,11 +155,11 @@ protected void doPostForm(HttpServletRequest request, HttpServletResponse respon
 		log.debug("LTI Service Form request from IP={}", ipAddress);
 
 		String allowOutcomes = ServerConfigurationService.getString(
-				SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT);
+				SakaiLTIUtil.LTI_OUTCOMES_ENABLED, SakaiLTIUtil.LTI_OUTCOMES_ENABLED_DEFAULT);
 		if ( ! "true".equals(allowOutcomes) ) allowOutcomes = null;
 
 		String allowRoster = ServerConfigurationService.getString(
-				SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED, SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED_DEFAULT);
+				SakaiLTIUtil.LTI_ROSTER_ENABLED, SakaiLTIUtil.LTI_ROSTER_ENABLED_DEFAULT);
 		if ( ! "true".equals(allowRoster) ) allowRoster = null;
 
 		if (allowOutcomes == null && allowRoster == null ) {
@@ -177,18 +177,18 @@ protected void doPostForm(HttpServletRequest request, HttpServletResponse respon
 		}
 
 		//check lti_message_type
-		String lti_message_type = request.getParameter(BasicLTIConstants.LTI_MESSAGE_TYPE);
+		String lti_message_type = request.getParameter(LTIConstants.LTI_MESSAGE_TYPE);
 		theMap.put("/message_response/lti_message_type", lti_message_type);
 		String sourcedid = null;
 		String message_type = null;
-		if( BasicLTIUtil.equals(lti_message_type, "basic-lis-replaceresult") ||
-			BasicLTIUtil.equals(lti_message_type, "basic-lis-createresult") ||
-			BasicLTIUtil.equals(lti_message_type, "basic-lis-updateresult") ||
-			BasicLTIUtil.equals(lti_message_type, "basic-lis-deleteresult") ||
-			BasicLTIUtil.equals(lti_message_type, "basic-lis-readresult") ) {
+		if( LTIUtil.equals(lti_message_type, "basic-lis-replaceresult") ||
+			LTIUtil.equals(lti_message_type, "basic-lis-createresult") ||
+			LTIUtil.equals(lti_message_type, "basic-lis-updateresult") ||
+			LTIUtil.equals(lti_message_type, "basic-lis-deleteresult") ||
+			LTIUtil.equals(lti_message_type, "basic-lis-readresult") ) {
 			sourcedid = request.getParameter("sourcedid");
 			if ( allowOutcomes != null ) message_type = "basicoutcome";
-		} else if( BasicLTIUtil.equals(lti_message_type, "basic-lis-readmembershipsforcontext") ) {
+		} else if( LTIUtil.equals(lti_message_type, "basic-lis-readmembershipsforcontext") ) {
 			sourcedid = request.getParameter("id");
 			if ( allowRoster != null ) message_type = "roster";
 		} else {
@@ -203,26 +203,26 @@ protected void doPostForm(HttpServletRequest request, HttpServletResponse respon
 		}
 
 		// This is for the pre-LTI 1.x "Sakai Basic Outcomes" and is probably never used
-		// Perform the Outcome here because we use SakaiBLTIUtil.handleGradebook()
+		// Perform the Outcome here because we use SakaiLTIUtil.handleGradebook()
 		if ( "basicoutcome".equals(message_type) ) {
 			processOutcome(request, response, lti_message_type, sourcedid, theMap);
 			return;
 		}
 
 		// No point continuing without a sourcedid
-		if(BasicLTIUtil.isBlank(sourcedid)) {
+		if(LTIUtil.isBlank(sourcedid)) {
 			doError(request, response, theMap, "outcomes.missing", "sourcedid", null);
 			return;
 		}
 
-		String lti_version = request.getParameter(BasicLTIConstants.LTI_VERSION);
-		if(!BasicLTIUtil.equals(lti_version, "LTI-1p0")) {
+		String lti_version = request.getParameter(LTIConstants.LTI_VERSION);
+		if(!LTIUtil.equals(lti_version, "LTI-1p0")) {
 			doError(request, response, theMap, "service.invalid", "lti_version="+lti_version, null);
 			return;
 		}
 
 		String oauth_consumer_key = request.getParameter("oauth_consumer_key");
-		if(BasicLTIUtil.isBlank(oauth_consumer_key)) {
+		if(LTIUtil.isBlank(oauth_consumer_key)) {
 			// no parameter for key, check header
 			final String authorizationHeader = request.getHeader("authorization");
 			if(authorizationHeader.contains("oauth_consumer_key") ) {
@@ -234,7 +234,7 @@ protected void doPostForm(HttpServletRequest request, HttpServletResponse respon
 					}
 				}
 			}
-			if(BasicLTIUtil.isBlank(oauth_consumer_key)) {
+			if(LTIUtil.isBlank(oauth_consumer_key)) {
 				doError(request, response, theMap, "outcomes.missing", "oauth_consumer_key", null);
 				return;
 			}
@@ -272,7 +272,7 @@ protected void doPostForm(HttpServletRequest request, HttpServletResponse respon
 
 		log.debug("signature={} user_id={} placement_id={}", signature, user_id, placement_id);
 
-		Properties normalProps = SakaiBLTIUtil.normalizePlacementProperties(placement_id, ltiService);
+		Properties normalProps = SakaiLTIUtil.normalizePlacementProperties(placement_id, ltiService);
 		if ( normalProps == null ) {
 			log.debug("Error retrieving result_sourcedid information");
 			doError(request, response, theMap, "outcomes.sourcedid", "sourcedid", null);
@@ -296,10 +296,10 @@ protected void doPostForm(HttpServletRequest request, HttpServletResponse respon
 		// Check the message signature using OAuth
 		String oauth_secret = normalProps.getProperty(LTIService.LTI_SECRET);
 		log.debug("oauth_secret: {}", oauth_secret);
-		oauth_secret = SakaiBLTIUtil.decryptSecret(oauth_secret);
+		oauth_secret = SakaiLTIUtil.decryptSecret(oauth_secret);
 		log.debug("oauth_secret (decrypted): {}", oauth_secret);
 
-		String URL = SakaiBLTIUtil.getOurServletPath(request);
+		String URL = SakaiLTIUtil.getOurServletPath(request);
 		OAuthMessage oam = OAuthServlet.getMessage(request, URL);
 		OAuthValidator oav = new SimpleOAuthValidator();
 		OAuthConsumer cons = new OAuthConsumer("about:blank#OAuth+CallBack+NotUsed", oauth_consumer_key,oauth_secret, null);
@@ -363,13 +363,13 @@ protected void processOutcome(HttpServletRequest request, HttpServletResponse re
 		throws java.io.IOException
 	{
 		// Things look good - time to process the grade
-		boolean isRead = BasicLTIUtil.equals(lti_message_type, "basic-lis-readresult");
-		boolean isDelete = BasicLTIUtil.equals(lti_message_type, "basic-lis-deleteresult");
+		boolean isRead = LTIUtil.equals(lti_message_type, "basic-lis-readresult");
+		boolean isDelete = LTIUtil.equals(lti_message_type, "basic-lis-deleteresult");
 
 		String result_resultscore_textstring = request.getParameter("result_resultscore_textstring");
 		String result_resultdata_text = request.getParameter("result_resultdata_text");
 
-		if(BasicLTIUtil.isBlank(result_resultscore_textstring) && ! isRead ) {
+		if(LTIUtil.isBlank(result_resultscore_textstring) && ! isRead ) {
 			doError(request, response, theMap, "outcomes.missing", "result_resultscore_textstring", null);
 			return;
 		}
@@ -381,7 +381,7 @@ protected void processOutcome(HttpServletRequest request, HttpServletResponse re
 		try {
 			Double dGrade;
 			if ( isRead ) {
-				retval = SakaiBLTIUtil.getGrade(sourcedid, request, ltiService);
+				retval = SakaiLTIUtil.getGrade(sourcedid, request, ltiService);
 				if ( retval instanceof Map ) {
 					Map grade = (Map) retval;
 					dGrade = (Double) grade.get("grade");
@@ -389,7 +389,7 @@ protected void processOutcome(HttpServletRequest request, HttpServletResponse re
 					theMap.put("/message_response/result/resultdata/text", (String) grade.get("comment"));
 				} else {
 					// Read fail with Good SourceDID is treated as empty
-					Object check = SakaiBLTIUtil.checkSourceDid(sourcedid, request, ltiService);
+					Object check = SakaiLTIUtil.checkSourceDid(sourcedid, request, ltiService);
 					if ( check instanceof Boolean && ((Boolean) check) ) {
 						theMap.put("/message_response/result/resultscore/textstring", "");
 						theMap.put("/message_response/result/resultdata/text", "");
@@ -399,14 +399,14 @@ protected void processOutcome(HttpServletRequest request, HttpServletResponse re
 					}
 				}
 		    } else if ( isDelete ) {
-				retval = SakaiBLTIUtil.deleteGrade(sourcedid, request, ltiService);
+				retval = SakaiLTIUtil.deleteGrade(sourcedid, request, ltiService);
 				if (retval instanceof String) {
 					doError(request, response, theMap, "outcome.fail", (String) retval, null);
 					return;
 				}
 			} else {
 				dGrade = new Double(result_resultscore_textstring);
-				retval = SakaiBLTIUtil.setGrade(sourcedid, request, ltiService, dGrade, result_resultdata_text);
+				retval = SakaiLTIUtil.setGrade(sourcedid, request, ltiService, dGrade, result_resultdata_text);
 				if (retval instanceof String) {
 					doError(request, response, theMap, "outcome.fail", (String) retval, null);
 					return;
@@ -436,8 +436,8 @@ protected void processRoster(HttpServletRequest request, HttpServletResponse res
 		log.debug("normalProps={}", normalProps);
 
 		// Check for permission in placement
-		String allowRoster = normalProps.getProperty(BASICLTI_PORTLET_ALLOWROSTER);
-		if ( ! BASICLTI_PORTLET_ON.equals(allowRoster) ) {
+		String allowRoster = normalProps.getProperty(LTI_PORTLET_ALLOWROSTER);
+		if ( ! LTI_PORTLET_ON.equals(allowRoster) ) {
 			doError(request, response, theMap, "service.notallowed", "lti_message_type="+lti_message_type, null);
 			return;
 		}
@@ -445,32 +445,32 @@ protected void processRoster(HttpServletRequest request, HttpServletResponse res
 		String roleMapProp = normalProps.getProperty("rolemap");
 		String releaseName = normalProps.getProperty(LTIService.LTI_SENDNAME);
 		String releaseEmail = normalProps.getProperty(LTIService.LTI_SENDEMAILADDR);
-		String assignment = normalProps.getProperty(BASICLTI_PORTLET_ASSIGNMENT);
+		String assignment = normalProps.getProperty(LTI_PORTLET_ASSIGNMENT);
 		String allowOutcomes = ServerConfigurationService.getString(
-				SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT);
+				SakaiLTIUtil.LTI_OUTCOMES_ENABLED, SakaiLTIUtil.LTI_OUTCOMES_ENABLED_DEFAULT);
 		if ( ! "true".equals(allowOutcomes) ) allowOutcomes = null;
 
 		String maintainRole = site.getMaintainRole();
 
-		SakaiBLTIUtil.pushAdvisor();
+		SakaiLTIUtil.pushAdvisor();
 		boolean success = false;
 		try {
 			List<Map<String,Object>> lm = new ArrayList<Map<String,Object>>();
-			Map<String, String> toolRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMapProp);
+			Map<String, String> toolRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMapProp);
 
 			// Hoist these out of the loop for performance..
-			Map<String, String> propRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(
-				ServerConfigurationService.getString(SakaiBLTIUtil.LTI_OUTBOUND_ROLE_MAP)
+			Map<String, String> propRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(
+				ServerConfigurationService.getString(SakaiLTIUtil.LTI_OUTBOUND_ROLE_MAP)
 			);
-			Map<String, String> defaultRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(
-				SakaiBLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT
+			Map<String, String> defaultRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(
+				SakaiLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT
 			);
 
-			Map<String, String> propLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(
-				ServerConfigurationService.getString(SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP)
+			Map<String, String> propLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(
+				ServerConfigurationService.getString(SakaiLTIUtil.LTI_LEGACY_ROLE_MAP)
 			);
-			Map<String, String> defaultLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(
-				SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT
+			Map<String, String> defaultLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(
+				SakaiLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT
 			);
 
 			// Get users for each of the members. UserDirectoryService.getUsers will skip any undefined users.
@@ -493,8 +493,8 @@ protected void processRoster(HttpServletRequest request, HttpServletResponse res
 				String sakaiRole = role.getId();
 
 				if (StringUtils.isNotBlank(sakaiRole)) {
-					ims_role = SakaiBLTIUtil.mapOutboundRole(sakaiRole, toolRoleMap, propRoleMap, defaultRoleMap, propLegacyMap, defaultLegacyMap);
-					log.debug("SakaiBLTIUtil.mapOutboundRole sakaiRole={} ims_role={}", sakaiRole, ims_role);
+					ims_role = SakaiLTIUtil.mapOutboundRole(sakaiRole, toolRoleMap, propRoleMap, defaultRoleMap, propLegacyMap, defaultLegacyMap);
+					log.debug("SakaiLTIUtil.mapOutboundRole sakaiRole={} ims_role={}", sakaiRole, ims_role);
 				}
 
 				if ( StringUtils.isNotBlank(ims_role) ) {
@@ -514,17 +514,17 @@ protected void processRoster(HttpServletRequest request, HttpServletResponse res
 				mm.put("/roles",ims_role);
 				if ( "true".equals(allowOutcomes) && assignment != null ) {
 					String placement_secret  = normalProps.getProperty(LTIService.LTI_PLACEMENTSECRET);
-					String result_sourcedid = SakaiBLTIUtil.getSourceDID(user, placement_id, placement_secret);
+					String result_sourcedid = SakaiLTIUtil.getSourceDID(user, placement_id, placement_secret);
 					if ( result_sourcedid != null ) mm.put("/lis_result_sourcedid",result_sourcedid);
 				}
 
-				if ( BASICLTI_PORTLET_ON.equals(releaseName) || BASICLTI_PORTLET_ON.equals(releaseEmail) ) {
-					if ( BASICLTI_PORTLET_ON.equals(releaseName) ) {
+				if ( LTI_PORTLET_ON.equals(releaseName) || LTI_PORTLET_ON.equals(releaseEmail) ) {
+					if ( LTI_PORTLET_ON.equals(releaseName) ) {
 						mm.put("/person_name_given",user.getFirstName());
 						mm.put("/person_name_family",user.getLastName());
 						mm.put("/person_name_full",user.getDisplayName());
 					}
-					if ( BASICLTI_PORTLET_ON.equals(releaseEmail) ) {
+					if ( LTI_PORTLET_ON.equals(releaseEmail) ) {
 						mm.put("/person_contact_email_primary",user.getEmail());
 						mm.put("/person_sourcedid",user.getEid());
 					}
@@ -552,7 +552,7 @@ protected void processRoster(HttpServletRequest request, HttpServletResponse res
 		} catch (Exception e) {
 			doError(request, response, theMap, "memberships.fail", "", e);
 		} finally {
-			SakaiBLTIUtil.popAdvisor();
+			SakaiLTIUtil.popAdvisor();
 		}
 
 		if ( ! success ) return;
@@ -615,7 +615,7 @@ protected void doPostXml(HttpServletRequest request, HttpServletResponse respons
 		log.debug("LTI POX Service request from IP={}", ipAddress);
 
 		String allowOutcomes = ServerConfigurationService.getString(
-				SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT);
+				SakaiLTIUtil.LTI_OUTCOMES_ENABLED, SakaiLTIUtil.LTI_OUTCOMES_ENABLED_DEFAULT);
 		if ( ! "true".equals(allowOutcomes) ) allowOutcomes = null;
 
 		if (allowOutcomes == null ) {
@@ -650,13 +650,13 @@ protected void doPostXml(HttpServletRequest request, HttpServletResponse respons
 		}
 
 		// No point continuing without a sourcedid
-		if(BasicLTIUtil.isBlank(sourcedid)) {
+		if(LTIUtil.isBlank(sourcedid)) {
 			doErrorXML(request, response, pox, "outcomes.missing", "sourcedid", null);
 			return;
 		}
 
 		// Handle the LTI 1.x Outcomes
-		// Perform the Outcome here because we use SakaiBLTIUtil.handleGradebook()
+		// Perform the Outcome here because we use SakaiLTIUtil.handleGradebook()
 		if ( allowOutcomes != null && "basicoutcome".equals(message_type) ) {
 			processOutcomeXml(request, response, lti_message_type, sourcedid, pox);
 			return;
@@ -696,7 +696,7 @@ protected void doPostXml(HttpServletRequest request, HttpServletResponse respons
 		log.debug("user_id={}", user_id);
 		log.debug("placement_id={}", placement_id);
 
-		Properties normalProps = SakaiBLTIUtil.normalizePlacementProperties(placement_id, ltiService);
+		Properties normalProps = SakaiLTIUtil.normalizePlacementProperties(placement_id, ltiService);
 		if ( normalProps == null ) {
 			log.debug("Error retrieving result_sourcedid information");
 			doErrorXML(request, response, pox, "outcomes.sourcedid", "sourcedid", null);
@@ -721,10 +721,10 @@ protected void doPostXml(HttpServletRequest request, HttpServletResponse respons
 		String oauth_consumer_key = pox.getOAuthConsumerKey();
 		String oauth_secret = normalProps.getProperty(LTIService.LTI_SECRET);
 		log.debug("oauth_secret: {}", oauth_secret);
-		oauth_secret = SakaiBLTIUtil.decryptSecret(oauth_secret);
+		oauth_secret = SakaiLTIUtil.decryptSecret(oauth_secret);
 		log.debug("oauth_secret (decrypted): {}", oauth_secret);
 
-		String URL = SakaiBLTIUtil.getOurServletPath(request);
+		String URL = SakaiLTIUtil.getOurServletPath(request);
 		pox.validateRequest(oauth_consumer_key, oauth_secret, request, URL);
 		if ( ! pox.valid ) {
 			if (pox.base_string != null) {
@@ -775,8 +775,8 @@ protected void processOutcomeXml(HttpServletRequest request, HttpServletResponse
 		throws java.io.IOException
 	{
 		// Things look good - time to process the grade
-		boolean isRead = BasicLTIUtil.equals(lti_message_type, "readResultRequest");
-		boolean isDelete = BasicLTIUtil.equals(lti_message_type, "deleteResultRequest");
+		boolean isRead = LTIUtil.equals(lti_message_type, "readResultRequest");
+		boolean isDelete = LTIUtil.equals(lti_message_type, "deleteResultRequest");
 
 		Map<String,String> bodyMap = pox.getBodyMap();
 		String result_resultscore_textstring = bodyMap.get("/resultRecord/result/resultScore/textString");
@@ -785,7 +785,7 @@ protected void processOutcomeXml(HttpServletRequest request, HttpServletResponse
 		log.debug("comment={}", result_resultdata_text);
 		log.debug("grade={}", result_resultscore_textstring);
 
-		if(BasicLTIUtil.isBlank(result_resultscore_textstring) && ! isRead && ! isDelete ) {
+		if(LTIUtil.isBlank(result_resultscore_textstring) && ! isRead && ! isDelete ) {
 			doErrorXML(request, response, pox, "outcomes.missing", "result_resultscore_textstring", null);
 			return;
 		}
@@ -796,12 +796,12 @@ protected void processOutcomeXml(HttpServletRequest request, HttpServletResponse
 		boolean success = false;
 		String message = null;
 		Object retval = null;
-		boolean strict = ServerConfigurationService.getBoolean(SakaiBLTIUtil.LTI_STRICT, false);
+		boolean strict = ServerConfigurationService.getBoolean(SakaiLTIUtil.LTI_STRICT, false);
 
 		try {
 			Double dGrade;
 			if ( isRead ) {
-				retval = SakaiBLTIUtil.getGrade(sourcedid, request, ltiService);
+				retval = SakaiLTIUtil.getGrade(sourcedid, request, ltiService);
 				String sGrade = "";
 				String comment = "";
 				if ( retval instanceof Map ) {
@@ -812,7 +812,7 @@ protected void processOutcomeXml(HttpServletRequest request, HttpServletResponse
 						sGrade = dGrade.toString();
 					}
 				} else {
-					Object check = SakaiBLTIUtil.checkSourceDid(sourcedid, request, ltiService);
+					Object check = SakaiLTIUtil.checkSourceDid(sourcedid, request, ltiService);
 					if ( check instanceof Boolean && ((Boolean) check) ) {
 						// Read fail with Good SourceDID is treated as empty
 					} else {
@@ -830,7 +830,7 @@ protected void processOutcomeXml(HttpServletRequest request, HttpServletResponse
 				}
 				message = "Result read";
 			} else if ( isDelete ) {
-				retval = SakaiBLTIUtil.deleteGrade(sourcedid, request, ltiService);
+				retval = SakaiLTIUtil.deleteGrade(sourcedid, request, ltiService);
 				if ( retval instanceof String ) {
 					doErrorXML(request, response, pox, "outcomes.fail", (String) retval, null);
 					return;
@@ -843,7 +843,7 @@ protected void processOutcomeXml(HttpServletRequest request, HttpServletResponse
 					throw new Exception("Grade out of range");
 				}
 				dGrade = new Double(result_resultscore_textstring);
-				retval = SakaiBLTIUtil.setGrade(sourcedid, request, ltiService, dGrade, result_resultdata_text);
+				retval = SakaiLTIUtil.setGrade(sourcedid, request, ltiService, dGrade, result_resultdata_text);
 				if ( retval instanceof String ) {
 					doErrorXML(request, response, pox, "outcomes.fail", (String) retval, null);
 					return;
diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIEntityProvider.java b/lti/lti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIEntityProvider.java
similarity index 100%
rename from basiclti/basiclti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIEntityProvider.java
rename to lti/lti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIEntityProvider.java
diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIListEntity.java b/lti/lti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIListEntity.java
similarity index 100%
rename from basiclti/basiclti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIListEntity.java
rename to lti/lti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIListEntity.java
diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIMapEntity.java b/lti/lti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIMapEntity.java
similarity index 100%
rename from basiclti/basiclti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIMapEntity.java
rename to lti/lti-blis/src/java/org/sakaiproject/lti/entityprovider/LTIMapEntity.java
diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti13/LTI13Servlet.java b/lti/lti-blis/src/java/org/sakaiproject/lti13/LTI13Servlet.java
similarity index 97%
rename from basiclti/basiclti-blis/src/java/org/sakaiproject/lti13/LTI13Servlet.java
rename to lti/lti-blis/src/java/org/sakaiproject/lti13/LTI13Servlet.java
index 5c370db506e2..93df70a27bac 100644
--- a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti13/LTI13Servlet.java
+++ b/lti/lti-blis/src/java/org/sakaiproject/lti13/LTI13Servlet.java
@@ -65,13 +65,13 @@
 import org.sakaiproject.authz.api.AuthzGroupService;
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;
-import org.sakaiproject.basiclti.util.LegacyShaUtil;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.getInt;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.getLongKey;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiKeySetUtil;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.LTI13_PATH;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.getOurServerUrl;
+import org.sakaiproject.lti.util.LegacyShaUtil;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.getInt;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.getLongKey;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
+import org.sakaiproject.lti.util.SakaiKeySetUtil;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI13_PATH;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.getOurServerUrl;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.exception.IdUnusedException;
@@ -80,7 +80,7 @@
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 import org.tsugi.jackson.JacksonUtil;
 import org.tsugi.lti13.LTICustomVars;
 import org.tsugi.lti13.LTI13KeySetUtil;
@@ -284,7 +284,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 		}
 
 		// /imsblis/lti13/postverify/{signed-placement}
-		if (SakaiBLTIUtil.checkSendPostVerify() && parts.length == 5 && "postverify".equals(parts[3])) {
+		if (SakaiLTIUtil.checkSendPostVerify() && parts.length == 5 && "postverify".equals(parts[3])) {
 			String signed_placement = parts[4];
 			handlePostVerify(signed_placement, request, response);
 			return;
@@ -517,14 +517,14 @@ protected void handlePostVerify(String signed_placement, HttpServletRequest requ
 		String context_id = site.getId();
 
 		String user_id = sess.getUserId();
-		String subject = SakaiBLTIUtil.getSubject(user_id, context_id);
+		String subject = SakaiLTIUtil.getSubject(user_id, context_id);
 
 		try {
 			Long issued = new Long(System.currentTimeMillis() / 1000L);
 			String body =
 				"{\n" +
-				"\"iss\": \""+SakaiBLTIUtil.getOurServerUrl()+"\",\n" +
-				"\"aud\": \""+SakaiBLTIUtil.getOurServerUrl()+"\",\n" +
+				"\"iss\": \""+SakaiLTIUtil.getOurServerUrl()+"\",\n" +
+				"\"aud\": \""+SakaiLTIUtil.getOurServerUrl()+"\",\n" +
 				"\"exp\": \""+(issued+3600L)+"\",\n" +
 				"\"user_id\": \""+user_id+"\",\n" +
 				"\"context_id\": \""+context_id+"\",\n" +
@@ -861,7 +861,7 @@ protected void handleTokenPost(String tool_id, HttpServletRequest request, HttpS
 		// Get the correct public key.
 		Key publicKey = null;
 		try {
-			publicKey = SakaiBLTIUtil.getPublicKey(tool, client_assertion);
+			publicKey = SakaiLTIUtil.getPublicKey(tool, client_assertion);
 		} catch (Exception e) {
 			LTI13Util.return400(response, e.getMessage());
 			return;
@@ -1091,7 +1091,7 @@ protected void handleLineItemScore(String signed_placement, String lineItemId, H
 
 		}
 
-		userId = SakaiBLTIUtil.parseSubject(userId);
+		userId = SakaiLTIUtil.parseSubject(userId);
 		if (!checkUserInSite(site, userId)) {
 			log.warn("User {} not found in siteId={}", userId, site.getId());
 			LTI13Util.return400(response, "User does not belong to site");
@@ -1103,7 +1103,7 @@ protected void handleLineItemScore(String signed_placement, String lineItemId, H
 		// When lineitem_key is null we are the "default" lineitem associated with the content object
 		// if the content item is associated with an assignment, we talk to the assignment API,
 		// if the content item is not associated with an assignment, we talk to the gradebook API
-		Object retval = SakaiBLTIUtil.handleGradebookLTI13(site, sat.tool_id, content, userId, lineitem_key, scoreObj);
+		Object retval = SakaiLTIUtil.handleGradebookLTI13(site, sat.tool_id, content, userId, lineitem_key, scoreObj);
 		log.debug("handleGradebookLTI13 retval={}",retval);
 		if ( retval instanceof String ) {
 			LTI13Util.return400(response, (String) retval);
@@ -1176,8 +1176,8 @@ protected void handleRegistrationEndpointPost(String tool_key_str, HttpServletRe
 		JSONObject jso = (JSONObject) js;
 
 		// Extract the bits
-		String initiate_login_uri = SakaiBLTIUtil.getStringNull(jso.get("initiate_login_uri"));
-		String jwks_uri = SakaiBLTIUtil.getStringNull(jso.get("jwks_uri"));
+		String initiate_login_uri = SakaiLTIUtil.getStringNull(jso.get("initiate_login_uri"));
+		String jwks_uri = SakaiLTIUtil.getStringNull(jso.get("jwks_uri"));
 		log.debug("initiate_login_uri={} jwks_uri={}", initiate_login_uri, jwks_uri);
 		Object redirect_uris_object = jso.get("redirect_uris");
 		JSONArray redirect_uris = null;
@@ -1222,7 +1222,7 @@ protected void handleRegistrationEndpointPost(String tool_key_str, HttpServletRe
 		Object toolConfigurationObj = jso.get("https://purl.imsglobal.org/spec/lti-tool-configuration");
 		if ( toolConfigurationObj instanceof JSONObject ) {
 			JSONObject toolConfiguration = (JSONObject) toolConfigurationObj;
-			String deployment_id = SakaiBLTIUtil.getDeploymentId(null);
+			String deployment_id = SakaiLTIUtil.getDeploymentId(null);
 			toolConfiguration.put("deployment_id", deployment_id);
 		}
 
@@ -1387,7 +1387,7 @@ protected void handleNamesAndRoles(String signed_placement, HttpServletRequest r
 
 		PrintWriter out = null;
 
-		SakaiBLTIUtil.pushAdvisor();
+		SakaiLTIUtil.pushAdvisor();
 		try {
 			boolean success = false;
 
@@ -1406,21 +1406,21 @@ protected void handleNamesAndRoles(String signed_placement, HttpServletRequest r
 			List<User> users = UserDirectoryService.getUsers(userIds);
 
 			String roleMapProp = (String) tool.get(LTIService.LTI_ROLEMAP);
-			Map<String, String> toolRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMapProp);
+			Map<String, String> toolRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMapProp);
 
 			// Hoist these out of the loop
-			Map<String, String> propRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(
-				ServerConfigurationService.getString(SakaiBLTIUtil.LTI_OUTBOUND_ROLE_MAP)
+			Map<String, String> propRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(
+				ServerConfigurationService.getString(SakaiLTIUtil.LTI_OUTBOUND_ROLE_MAP)
 			);
-			Map<String, String> defaultRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(
-				SakaiBLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT
+			Map<String, String> defaultRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(
+				SakaiLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT
 			);
 
-			Map<String, String> propLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(
-				ServerConfigurationService.getString(SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP)
+			Map<String, String> propLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(
+				ServerConfigurationService.getString(SakaiLTIUtil.LTI_LEGACY_ROLE_MAP)
 			);
-			Map<String, String> defaultLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(
-				SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT
+			Map<String, String> defaultLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(
+				SakaiLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT
 			);
 
 			// Do we need a Link header
@@ -1458,7 +1458,7 @@ protected void handleNamesAndRoles(String signed_placement, HttpServletRequest r
 				jo.put("status", "Active");
 				String lti11_legacy_user_id = user.getId();
 				jo.put("lti11_legacy_user_id", lti11_legacy_user_id);
-				String subject = SakaiBLTIUtil.getSubject(lti11_legacy_user_id, site.getId());
+				String subject = SakaiLTIUtil.getSubject(lti11_legacy_user_id, site.getId());
 				jo.put("user_id", subject);   // TODO: Should be subject - LTI13 Quirk
 				jo.put("lis_person_sourcedid", user.getEid());
 
@@ -1479,8 +1479,8 @@ protected void handleNamesAndRoles(String signed_placement, HttpServletRequest r
 				String sakaiRole = role.getId();
 
 				if (StringUtils.isNotBlank(sakaiRole)) {
-					outboundRole = SakaiBLTIUtil.mapOutboundRole(sakaiRole, toolRoleMap, propRoleMap, defaultRoleMap, propLegacyMap, defaultLegacyMap);
-					log.debug("SakaiBLTIUtil.mapOutboundRole sakaiRole={} outboundRole={}", sakaiRole, outboundRole);
+					outboundRole = SakaiLTIUtil.mapOutboundRole(sakaiRole, toolRoleMap, propRoleMap, defaultRoleMap, propLegacyMap, defaultLegacyMap);
+					log.debug("SakaiLTIUtil.mapOutboundRole sakaiRole={} outboundRole={}", sakaiRole, outboundRole);
 				}
 
 				JSONArray roles = new JSONArray();
@@ -1500,7 +1500,7 @@ protected void handleNamesAndRoles(String signed_placement, HttpServletRequest r
 				if ( sat.hasScope(SakaiAccessToken.SCOPE_SCORE)  && assignment_name != null ) {
 					String placement_secret  = (String) content.get(LTIService.LTI_PLACEMENTSECRET);
 					String placement_id = getPlacementId(signed_placement);
-					String result_sourcedid = SakaiBLTIUtil.getSourceDID(user, placement_id, placement_secret);
+					String result_sourcedid = SakaiLTIUtil.getSourceDID(user, placement_id, placement_secret);
 					if ( result_sourcedid != null ) sakai_ext.put("lis_result_sourcedid",result_sourcedid);
 				}
 				*/
@@ -1557,7 +1557,7 @@ protected void handleNamesAndRoles(String signed_placement, HttpServletRequest r
 				out.println(" ] }");
 			}
 		} finally {
-			SakaiBLTIUtil.popAdvisor();
+			SakaiLTIUtil.popAdvisor();
 		}
 
 	}
@@ -1568,7 +1568,7 @@ protected void handleGroupService(String site_id, HttpServletRequest request, Ht
 		String subject = request.getParameter("user_id");
 		String user_id = null;
 		if ( StringUtils.isNotEmpty(subject)) {
-			user_id = SakaiBLTIUtil.parseSubject(subject);
+			user_id = SakaiLTIUtil.parseSubject(subject);
 		}
 
 		log.debug("site_id={} subject={} user_id={}", site_id, subject, user_id);
@@ -1619,7 +1619,7 @@ protected void handleGroupService(String site_id, HttpServletRequest request, Ht
 			site.getGroups() :
 			site.getGroupsWithMember(user_id);
 
-		SakaiBLTIUtil.pushAdvisor();
+		SakaiLTIUtil.pushAdvisor();
 
 		try {
 			boolean success = false;
@@ -1687,7 +1687,7 @@ protected void handleGroupService(String site_id, HttpServletRequest request, Ht
 				out.println(" ] }");
 			}
 		} finally {
-			SakaiBLTIUtil.popAdvisor();
+			SakaiLTIUtil.popAdvisor();
 		}
 
 	}
@@ -2422,7 +2422,7 @@ private void resultsForAssignment(String signed_placement, Site site, Assignment
 
 		String context_id = site.getId();
 
-		SakaiBLTIUtil.pushAdvisor();
+		SakaiLTIUtil.pushAdvisor();
 		try {
 			boolean success = false;
 
@@ -2450,7 +2450,7 @@ private void resultsForAssignment(String signed_placement, Site site, Assignment
 			for (User user : users) {
 				Result result = new Result();
                                 String lti11_legacy_user_id = user.getId();
-                                String subject = SakaiBLTIUtil.getSubject(lti11_legacy_user_id, context_id);
+                                String subject = SakaiLTIUtil.getSubject(lti11_legacy_user_id, context_id);
 				result.userId = subject;
 				result.resultMaximum = a.getPoints();
 
@@ -2507,7 +2507,7 @@ private void resultsForAssignment(String signed_placement, Site site, Assignment
 		} catch (Throwable t) {
 			log.error(t.getMessage(), t);
 		} finally {
-			SakaiBLTIUtil.popAdvisor();
+			SakaiLTIUtil.popAdvisor();
 		}
 	}
 
diff --git a/basiclti/basiclti-blis/src/test/org/sakaiproject/lti/entityprovider/LTIEntityProviderTest.java b/lti/lti-blis/src/test/org/sakaiproject/lti/entityprovider/LTIEntityProviderTest.java
similarity index 100%
rename from basiclti/basiclti-blis/src/test/org/sakaiproject/lti/entityprovider/LTIEntityProviderTest.java
rename to lti/lti-blis/src/test/org/sakaiproject/lti/entityprovider/LTIEntityProviderTest.java
diff --git a/basiclti/basiclti-blis/src/webapp/WEB-INF/applicationContext.xml b/lti/lti-blis/src/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from basiclti/basiclti-blis/src/webapp/WEB-INF/applicationContext.xml
rename to lti/lti-blis/src/webapp/WEB-INF/applicationContext.xml
diff --git a/basiclti/basiclti-blis/src/webapp/WEB-INF/web.xml b/lti/lti-blis/src/webapp/WEB-INF/web.xml
similarity index 95%
rename from basiclti/basiclti-blis/src/webapp/WEB-INF/web.xml
rename to lti/lti-blis/src/webapp/WEB-INF/web.xml
index 1f1e63fce690..efed01fe7731 100644
--- a/basiclti/basiclti-blis/src/webapp/WEB-INF/web.xml
+++ b/lti/lti-blis/src/webapp/WEB-INF/web.xml
@@ -19,7 +19,7 @@
 
   <servlet>
     <servlet-name>ServiceServlet</servlet-name>
-    <servlet-class>org.sakaiproject.blti.ServiceServlet</servlet-class>
+    <servlet-class>org.sakaiproject.lti.ServiceServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
diff --git a/basiclti/basiclti-blis/src/webapp/whatisthis.htm b/lti/lti-blis/src/webapp/whatisthis.htm
similarity index 100%
rename from basiclti/basiclti-blis/src/webapp/whatisthis.htm
rename to lti/lti-blis/src/webapp/whatisthis.htm
diff --git a/basiclti/basiclti-common/LICENSE b/lti/lti-common/LICENSE
similarity index 100%
rename from basiclti/basiclti-common/LICENSE
rename to lti/lti-common/LICENSE
diff --git a/basiclti/basiclti-common/README b/lti/lti-common/README
similarity index 100%
rename from basiclti/basiclti-common/README
rename to lti/lti-common/README
diff --git a/basiclti/basiclti-common/pom.xml b/lti/lti-common/pom.xml
similarity index 91%
rename from basiclti/basiclti-common/pom.xml
rename to lti/lti-common/pom.xml
index 1cd94cce7142..5a06111af6d4 100644
--- a/basiclti/basiclti-common/pom.xml
+++ b/lti/lti-common/pom.xml
@@ -3,24 +3,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
-    <name>LTI Common (basiclti-common)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti-common</artifactId>
+    <name>LTI Common (lti-common)</name>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti-common</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/linktool/LinkToolUtil.java b/lti/lti-common/src/java/org/sakaiproject/linktool/LinkToolUtil.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/linktool/LinkToolUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/linktool/LinkToolUtil.java
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/LocalEventTrackingService.java b/lti/lti-common/src/java/org/sakaiproject/lti/LocalEventTrackingService.java
similarity index 97%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/LocalEventTrackingService.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/LocalEventTrackingService.java
index 66d795db3069..8dfacb9ef831 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/LocalEventTrackingService.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/LocalEventTrackingService.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sakaiproject.basiclti;
+package org.sakaiproject.lti;
 
 import org.sakaiproject.event.cover.EventTrackingService;
 
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/UrlUtility.java b/lti/lti-common/src/java/org/sakaiproject/lti/UrlUtility.java
similarity index 99%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/UrlUtility.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/UrlUtility.java
index 6cbe5a1c2722..3c06d39596bb 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/UrlUtility.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/UrlUtility.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti;
+package org.sakaiproject.lti;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/BlowFish.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/BlowFish.java
similarity index 97%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/BlowFish.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/BlowFish.java
index aaa1211ba3b1..4c0df3bb5e84 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/BlowFish.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/BlowFish.java
@@ -16,13 +16,13 @@
  * This code was adapted from Chuck Hedreick's Linktool utlity code
  */
 
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.sakaiproject.basiclti.util.PortableShaUtil;
+import org.sakaiproject.lti.util.PortableShaUtil;
 
 /**
  * Support Blowfish Encryption and Decryption
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/LegacyShaUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/LegacyShaUtil.java
similarity index 99%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/LegacyShaUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/LegacyShaUtil.java
index 78cd6053fdf6..384fdefa0e00 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/LegacyShaUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/LegacyShaUtil.java
@@ -37,7 +37,7 @@
  * database as well as LTI tool databases all over the place. :(
  */
 
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/PortableShaUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/PortableShaUtil.java
similarity index 99%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/PortableShaUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/PortableShaUtil.java
index 8fb2762673fb..4fa71bfd7818 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/PortableShaUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/PortableShaUtil.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiContentItemUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiContentItemUtil.java
similarity index 92%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiContentItemUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiContentItemUtil.java
index b25a9796cf1e..62d4fd5e13fd 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiContentItemUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiContentItemUtil.java
@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import org.tsugi.contentitem.objects.Icon;
 import org.tsugi.contentitem.objects.PlacementAdvice;
 import org.tsugi.contentitem.objects.LtiLinkItem;
 import org.tsugi.contentitem.objects.ContentItemResponse;
 
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiLTIProviderUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIProviderUtil;
 import org.sakaiproject.tool.api.Tool;
 import org.sakaiproject.tool.cover.ToolManager;
 
@@ -49,7 +49,7 @@ public static LtiLinkItem getLtiLinkItem(String toolRegistration)
 		PlacementAdvice placementAdvice = new PlacementAdvice();
 
 		// If we are http, lets go in a new window
-		String serverUrl = SakaiBLTIUtil.getOurServerUrl();
+		String serverUrl = SakaiLTIUtil.getOurServerUrl();
 		if ( serverUrl.startsWith("https://") ) {
 			placementAdvice.setPresentationDocumentTarget(placementAdvice.IFRAME);
 		} else {
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiKeySetUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiKeySetUtil.java
similarity index 98%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiKeySetUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiKeySetUtil.java
index 13bb3702be25..a88f16f3d58d 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiKeySetUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiKeySetUtil.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -49,7 +49,7 @@
  * previous.
  *
  *
- * Sakai conventions for making and launching BLTI resources within Sakai.
+ * Sakai conventions for making and launching LTI resources within Sakai.
  */
 @SuppressWarnings("deprecation")
 @Slf4j
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiLTIProviderUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiLTIProviderUtil.java
similarity index 90%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiLTIProviderUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiLTIProviderUtil.java
index 10be1cc3fcf2..cef4b73a79fb 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiLTIProviderUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiLTIProviderUtil.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,9 +25,9 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.component.cover.ComponentManager;
 
@@ -40,7 +40,7 @@ public class SakaiLTIProviderUtil {
 
 	public static String getProviderLaunchUrl(String toolRegistration) 
 	{
-                return SakaiBLTIUtil.getOurServerUrl() + "/imsblti/provider/"+toolRegistration;
+                return SakaiLTIUtil.getOurServerUrl() + "/imsblti/provider/"+toolRegistration;
 	}
 
 	public static final String EMAIL_TRUSTED_CONSUMER = "basiclti.provider.email.trusted.consumers";
@@ -77,7 +77,7 @@ private static boolean findTrustedConsumer(String oauth_consumer_key, String tru
 		ServerConfigurationService cnf = (ServerConfigurationService) ComponentManager
 				.get(ServerConfigurationService.class);
 		final String trustedConsumersConfig = cnf.getString(trustedConsumerProp, null);
-		if (BasicLTIUtil.isNotBlank(trustedConsumersConfig)) {
+		if (LTIUtil.isNotBlank(trustedConsumersConfig)) {
 			List<String> consumersList = Arrays.asList(trustedConsumersConfig.split(":"));
 			if (consumersList.contains(oauth_consumer_key)) {
 				isTrusted = true;
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiLTIUtil.java
similarity index 89%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiLTIUtil.java
index 6bc0011d080f..2c0a7aada6af 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/SakaiLTIUtil.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -93,8 +93,8 @@
 import org.sakaiproject.lti13.util.SakaiDeepLink;
 import org.sakaiproject.lti13.util.SakaiLaunchJWT;
 import org.sakaiproject.lti13.util.SakaiExtension;
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
 import org.tsugi.jackson.JacksonUtil;
 import org.tsugi.ags2.objects.Score;
 import org.tsugi.lti13.LTI13ConstantsUtil;
@@ -116,7 +116,7 @@
 import org.tsugi.lti13.objects.ToolPlatform;
 import org.tsugi.lti13.objects.ForUser;
 import org.tsugi.lti13.objects.LTI11Transition;
-import org.tsugi.basiclti.ContentItem;
+import org.tsugi.lti.ContentItem;
 
 import io.jsonwebtoken.Jwts;
 import lombok.extern.slf4j.Slf4j;
@@ -124,27 +124,27 @@
 
 /**
  * Some Sakai Utility code for LTI This is mostly code to support the
- * Sakai conventions for making and launching BLTI resources within Sakai.
+ * Sakai conventions for making and launching LTI resources within Sakai.
  */
 @SuppressWarnings("deprecation")
 @Slf4j
-public class SakaiBLTIUtil {
+public class SakaiLTIUtil {
 
 	public static final boolean verbosePrint = false;
 
 	// Property: If false(default), allows comment to be returned in an LTI 1.1 POX read outcome
 	public static final String LTI_STRICT = "lti.strict";
 
-	public static final String BASICLTI_OUTCOMES_ENABLED = "lti.outcomes.enabled";
-	public static final String BASICLTI_OUTCOMES_ENABLED_DEFAULT = "true";
-	public static final String BASICLTI_ROSTER_ENABLED = "lti.roster.enabled";
-	public static final String BASICLTI_ROSTER_ENABLED_DEFAULT = "true";
-	public static final String BASICLTI_LINEITEMS_ENABLED = "lti.lineitems.enabled";
-	public static final String BASICLTI_LINEITEMS_ENABLED_DEFAULT = "true";
-	public static final String BASICLTI_CONSUMER_USERIMAGE_ENABLED = "lti.consumer.userimage.enabled";
+	public static final String LTI_OUTCOMES_ENABLED = "lti.outcomes.enabled";
+	public static final String LTI_OUTCOMES_ENABLED_DEFAULT = "true";
+	public static final String LTI_ROSTER_ENABLED = "lti.roster.enabled";
+	public static final String LTI_ROSTER_ENABLED_DEFAULT = "true";
+	public static final String LTI_LINEITEMS_ENABLED = "lti.lineitems.enabled";
+	public static final String LTI_LINEITEMS_ENABLED_DEFAULT = "true";
+	public static final String LTI_CONSUMER_USERIMAGE_ENABLED = "lti.consumer.userimage.enabled";
 	public static final String INCOMING_ROSTER_ENABLED = "lti.incoming.roster.enabled";
-	public static final String BASICLTI_ENCRYPTION_KEY = "lti.encryption.key";
-	public static final String BASICLTI_LAUNCH_SESSION_TIMEOUT = "lti.launch.session.timeout";
+	public static final String LTI_ENCRYPTION_KEY = "lti.encryption.key";
+	public static final String LTI_LAUNCH_SESSION_TIMEOUT = "lti.launch.session.timeout";
 	public static final String LTI13_DEPLOYMENT_ID = "lti13.deployment_id";
 	public static final String LTI13_DEPLOYMENT_ID_DEFAULT = "1"; // To match Moodle
 	public static final String LTI_CUSTOM_SUBSTITION_PREFIX =  "lti.custom.substitution.";
@@ -156,18 +156,18 @@ public class SakaiBLTIUtil {
 	public static final String LTI_ADVANTAGE_POST_VERIFY_ENABLED_DEFAULT = "false";
 
 	// These are the field names in old school portlet placements
-	public static final String BASICLTI_PORTLET_KEY = "key";
-	public static final String BASICLTI_PORTLET_ALLOWROSTER = "allowroster";
-	public static final String BASICLTI_PORTLET_OFF = "off";
-	public static final String BASICLTI_PORTLET_ON = "on";
-	public static final String BASICLTI_PORTLET_ASSIGNMENT = "assignment";
-	public static final String BASICLTI_PORTLET_RELEASENAME = "releasename";
-	public static final String BASICLTI_PORTLET_RELEASEEMAIL = "releaseemail";
-	public static final String BASICLTI_PORTLET_TOOLSETTING = "toolsetting";
-	public static final String BASICLTI_PORTLET_TOOLTITLE = "tooltitle";
-	public static final String BASICLTI_PORTLET_DESCRIPTION = "description";
-	public static final String BASICLTI_PORTLET_PLACEMENTSECRET = LTIService.LTI_PLACEMENTSECRET;
-	public static final String BASICLTI_PORTLET_OLDPLACEMENTSECRET = LTIService.LTI_OLDPLACEMENTSECRET;
+	public static final String LTI_PORTLET_KEY = "key";
+	public static final String LTI_PORTLET_ALLOWROSTER = "allowroster";
+	public static final String LTI_PORTLET_OFF = "off";
+	public static final String LTI_PORTLET_ON = "on";
+	public static final String LTI_PORTLET_ASSIGNMENT = "assignment";
+	public static final String LTI_PORTLET_RELEASENAME = "releasename";
+	public static final String LTI_PORTLET_RELEASEEMAIL = "releaseemail";
+	public static final String LTI_PORTLET_TOOLSETTING = "toolsetting";
+	public static final String LTI_PORTLET_TOOLTITLE = "tooltitle";
+	public static final String LTI_PORTLET_DESCRIPTION = "description";
+	public static final String LTI_PORTLET_PLACEMENTSECRET = LTIService.LTI_PLACEMENTSECRET;
+	public static final String LTI_PORTLET_OLDPLACEMENTSECRET = LTIService.LTI_OLDPLACEMENTSECRET;
 
 	public static final String LTI11_SERVICE_PATH = "/imsblis/service/";
 	public static final String LTI13_PATH = "/imsblis/lti13/";
@@ -238,17 +238,17 @@ public class SakaiBLTIUtil {
 	;
 
 		public static boolean rosterEnabled() {
-			String allowRoster = ServerConfigurationService.getString(BASICLTI_ROSTER_ENABLED, BASICLTI_ROSTER_ENABLED_DEFAULT);
+			String allowRoster = ServerConfigurationService.getString(LTI_ROSTER_ENABLED, LTI_ROSTER_ENABLED_DEFAULT);
 			return "true".equals(allowRoster);
 		}
 
 		public static boolean outcomesEnabled() {
-			String allowOutcomes = ServerConfigurationService.getString(BASICLTI_OUTCOMES_ENABLED, BASICLTI_OUTCOMES_ENABLED_DEFAULT);
+			String allowOutcomes = ServerConfigurationService.getString(LTI_OUTCOMES_ENABLED, LTI_OUTCOMES_ENABLED_DEFAULT);
 			return "true".equals(allowOutcomes);
 		}
 
 		public static boolean lineItemsEnabled() {
-			String allowLineItems = ServerConfigurationService.getString(BASICLTI_LINEITEMS_ENABLED, BASICLTI_LINEITEMS_ENABLED_DEFAULT);
+			String allowLineItems = ServerConfigurationService.getString(LTI_LINEITEMS_ENABLED, LTI_LINEITEMS_ENABLED_DEFAULT);
 			return "true".equals(allowLineItems);
 		}
 
@@ -257,8 +257,8 @@ public static boolean lineItemsEnabled() {
 		public static String getCorrectProperty(Properties config, String propName, Placement placement) {
 			// Check for global overrides in properties
 
-			if (BASICLTI_PORTLET_ALLOWROSTER.equals(propName) && !rosterEnabled()) {
-				return BASICLTI_PORTLET_OFF;
+			if (LTI_PORTLET_ALLOWROSTER.equals(propName) && !rosterEnabled()) {
+				return LTI_PORTLET_OFF;
 			}
 
 			// Check for explicit setting in properties
@@ -285,12 +285,12 @@ public static boolean loadFromPlacement(Properties info, Properties launch, Plac
 				if (xml == null) {
 					return false;
 				}
-				BasicLTIUtil.parseDescriptor(info, launch, xml);
+				LTIUtil.parseDescriptor(info, launch, xml);
 			}
 
 			String secret = getCorrectProperty(config, LTIService.LTI_SECRET, placement);
 
-			// BLTI-195 - Compatibility mode for old-style encrypted secrets
+			// LTI-195 - Compatibility mode for old-style encrypted secrets
 			if (secret == null || secret.trim().length() < 1) {
 				String eSecret = getCorrectProperty(config, "encryptedsecret", placement);
 				if (StringUtils.isNotBlank(eSecret) ) {
@@ -301,11 +301,11 @@ public static boolean loadFromPlacement(Properties info, Properties launch, Plac
 			setProperty(info, LTIService.LTI_SECRET, secret);
 
 			// This is not "consumerkey" on purpose - we are mimicking the old placement model
-			setProperty(info, BASICLTI_PORTLET_KEY, getCorrectProperty(config, BASICLTI_PORTLET_KEY, placement));
+			setProperty(info, LTI_PORTLET_KEY, getCorrectProperty(config, LTI_PORTLET_KEY, placement));
 			setProperty(info, LTIService.LTI_DEBUG, getCorrectProperty(config, LTIService.LTI_DEBUG, placement));
 			setProperty(info, LTIService.LTI_FRAMEHEIGHT, getCorrectProperty(config, LTIService.LTI_FRAMEHEIGHT, placement));
 			setProperty(info, LTIService.LTI_NEWPAGE, getCorrectProperty(config, LTIService.LTI_NEWPAGE, placement));
-			setProperty(info, LTIService.LTI_TITLE, getCorrectProperty(config, BASICLTI_PORTLET_TOOLTITLE, placement));
+			setProperty(info, LTIService.LTI_TITLE, getCorrectProperty(config, LTI_PORTLET_TOOLTITLE, placement));
 
 			// Pull in and parse the custom parameters
 			String customstr = toNull(getCorrectProperty(config, LTIService.LTI_CUSTOM, placement));
@@ -340,7 +340,7 @@ public static void parseCustom(Properties info, String customstr) {
 					if (pos + 1 > param.length()) {
 						continue;
 					}
-					String key = BasicLTIUtil.mapKeyName(param.substring(0, pos));
+					String key = LTIUtil.mapKeyName(param.substring(0, pos));
 					if (key == null) {
 						continue;
 					}
@@ -423,7 +423,7 @@ public static boolean mergeLTI1Custom(Properties custom, String customstr)
 				int pos = param.indexOf("=");
 				if ( pos < 1 ) continue;
 				if ( pos+1 > param.length() ) continue;
-				String key = BasicLTIUtil.mapKeyName(param.substring(0,pos));
+				String key = LTIUtil.mapKeyName(param.substring(0,pos));
 				if ( key == null ) continue;
 
 				if ( custom.containsKey(key) ) continue;
@@ -438,7 +438,7 @@ public static boolean mergeLTI1Custom(Properties custom, String customstr)
 		}
 
 		public static String encryptSecret(String orig) {
-			String encryptionKey = ServerConfigurationService.getString(BASICLTI_ENCRYPTION_KEY, null);
+			String encryptionKey = ServerConfigurationService.getString(LTI_ENCRYPTION_KEY, null);
 			return encryptSecret(orig, encryptionKey);
 		}
 
@@ -460,7 +460,7 @@ public static String encryptSecret(String orig, String encryptionKey) {
 		}
 
 		public static String decryptSecret(String orig) {
-			String encryptionKey = ServerConfigurationService.getString(BASICLTI_ENCRYPTION_KEY, null);
+			String encryptionKey = ServerConfigurationService.getString(LTI_ENCRYPTION_KEY, null);
 			return decryptSecret(orig, encryptionKey, false);
 		}
 
@@ -490,13 +490,13 @@ public static void addSiteInfo(Properties props, Properties lti13subst, Site sit
 		if (site != null) {
 			String context_type = site.getType();
 			if (context_type != null && context_type.toLowerCase().contains("course")) {
-				setProperty(props, BasicLTIConstants.CONTEXT_TYPE, BasicLTIConstants.CONTEXT_TYPE_COURSE_SECTION);
+				setProperty(props, LTIConstants.CONTEXT_TYPE, LTIConstants.CONTEXT_TYPE_COURSE_SECTION);
 				setProperty(lti13subst, LTICustomVars.CONTEXT_TYPE, LTICustomVars.CONTEXT_TYPE_DEFAULT);
 			} else {
-				setProperty(props, BasicLTIConstants.CONTEXT_TYPE, BasicLTIConstants.CONTEXT_TYPE_GROUP);
-				setProperty(lti13subst, LTICustomVars.CONTEXT_TYPE, BasicLTIConstants.CONTEXT_TYPE_GROUP);
+				setProperty(props, LTIConstants.CONTEXT_TYPE, LTIConstants.CONTEXT_TYPE_GROUP);
+				setProperty(lti13subst, LTICustomVars.CONTEXT_TYPE, LTIConstants.CONTEXT_TYPE_GROUP);
 			}
-			setProperty(props, BasicLTIConstants.CONTEXT_ID, site.getId());
+			setProperty(props, LTIConstants.CONTEXT_ID, site.getId());
 			setProperty(lti13subst, LTICustomVars.COURSESECTION_SOURCEDID, site.getId());
 			setProperty(lti13subst, LTICustomVars.CONTEXT_ID, site.getId());
 
@@ -506,23 +506,23 @@ public static void addSiteInfo(Properties props, Properties lti13subst, Site sit
 			TimeZone context_timezone = TimeZone.getDefault ();
 			setProperty(lti13subst, LTICustomVars.CONTEXT_TIMEZONE, context_timezone.getID());
 
-			setProperty(props, BasicLTIConstants.CONTEXT_LABEL, site.getTitle());
+			setProperty(props, LTIConstants.CONTEXT_LABEL, site.getTitle());
 			setProperty(lti13subst, LTICustomVars.COURSESECTION_LABEL, site.getTitle());
 			setProperty(lti13subst, LTICustomVars.CONTEXT_LABEL, site.getTitle());
 
-			setProperty(props, BasicLTIConstants.CONTEXT_TITLE, site.getTitle());
+			setProperty(props, LTIConstants.CONTEXT_TITLE, site.getTitle());
 			setProperty(lti13subst, LTICustomVars.COURSESECTION_LONGDESCRIPTION, site.getTitle());
 			setProperty(lti13subst, LTICustomVars.CONTEXT_TITLE, site.getTitle());
 
 			String courseRoster = getExternalRealmId(site.getId());
 			if (courseRoster != null) {
-				setProperty(props, BasicLTIConstants.LIS_COURSE_OFFERING_SOURCEDID, courseRoster);
-				setProperty(props, BasicLTIConstants.LIS_COURSE_SECTION_SOURCEDID, courseRoster);
+				setProperty(props, LTIConstants.LIS_COURSE_OFFERING_SOURCEDID, courseRoster);
+				setProperty(props, LTIConstants.LIS_COURSE_SECTION_SOURCEDID, courseRoster);
 				setProperty(lti13subst, LTICustomVars.COURSESECTION_SOURCEDID, courseRoster);
 				setProperty(lti13subst, LTICustomVars.COURSEOFFERING_SOURCEDID, courseRoster);
 			} else {
-				setProperty(props, BasicLTIConstants.LIS_COURSE_OFFERING_SOURCEDID, site.getId());
-				setProperty(props, BasicLTIConstants.LIS_COURSE_SECTION_SOURCEDID, site.getId());
+				setProperty(props, LTIConstants.LIS_COURSE_OFFERING_SOURCEDID, site.getId());
+				setProperty(props, LTIConstants.LIS_COURSE_SECTION_SOURCEDID, site.getId());
 				setProperty(lti13subst, LTICustomVars.COURSESECTION_SOURCEDID, site.getId());
 				setProperty(lti13subst, LTICustomVars.COURSEOFFERING_SOURCEDID, site.getId());
 			}
@@ -554,22 +554,22 @@ public static void addSiteInfo(Properties props, Properties lti13subst, Site sit
 			returnUrl = returnUrl + "/" + site.getId();
 		}
 
-		setProperty(props, BasicLTIConstants.LAUNCH_PRESENTATION_RETURN_URL, returnUrl);
+		setProperty(props, LTIConstants.LAUNCH_PRESENTATION_RETURN_URL, returnUrl);
 	}
 
 	public static void addUserInfo(Properties ltiProps, Properties lti13subst, User user, Map<String, Object> tool) {
 		int releasename = getInt(tool.get(LTIService.LTI_SENDNAME));
 		int releaseemail = getInt(tool.get(LTIService.LTI_SENDEMAILADDR));
 		if (user != null) {
-			setProperty(ltiProps, BasicLTIConstants.USER_ID, user.getId());
+			setProperty(ltiProps, LTIConstants.USER_ID, user.getId());
 			setProperty(lti13subst, LTICustomVars.USER_ID, user.getId());
-			setProperty(ltiProps, BasicLTIConstants.LIS_PERSON_SOURCEDID, user.getEid());
+			setProperty(ltiProps, LTIConstants.LIS_PERSON_SOURCEDID, user.getEid());
 			setProperty(lti13subst, LTICustomVars.USER_USERNAME, user.getEid());
 			setProperty(lti13subst, LTICustomVars.PERSON_SOURCEDID, user.getEid());
 
 			ResourceProperties userProperties = user.getProperties();
 			userProperties.getPropertyNames().forEachRemaining(name ->
-				setProperty(lti13subst, BasicLTIConstants.SAKAI_USER_PROPERTY + "." + name, userProperties.getProperty(name))
+				setProperty(lti13subst, LTIConstants.SAKAI_USER_PROPERTY + "." + name, userProperties.getProperty(name))
 			);
 
 			UserTimeService userTimeService = ComponentManager.get(UserTimeService.class);
@@ -579,20 +579,20 @@ public static void addUserInfo(Properties ltiProps, Properties lti13subst, User
 			}
 
 			if (releasename == 1) {
-				setProperty(ltiProps, BasicLTIConstants.LIS_PERSON_NAME_GIVEN, user.getFirstName());
-				setProperty(ltiProps, BasicLTIConstants.LIS_PERSON_NAME_FAMILY, user.getLastName());
-				setProperty(ltiProps, BasicLTIConstants.LIS_PERSON_NAME_FULL, user.getDisplayName());
+				setProperty(ltiProps, LTIConstants.LIS_PERSON_NAME_GIVEN, user.getFirstName());
+				setProperty(ltiProps, LTIConstants.LIS_PERSON_NAME_FAMILY, user.getLastName());
+				setProperty(ltiProps, LTIConstants.LIS_PERSON_NAME_FULL, user.getDisplayName());
 				setProperty(lti13subst, LTICustomVars.PERSON_NAME_GIVEN, user.getFirstName());
 				setProperty(lti13subst, LTICustomVars.PERSON_NAME_FAMILY, user.getLastName());
 				setProperty(lti13subst, LTICustomVars.PERSON_NAME_FULL, user.getDisplayName());
 			}
 			if (releaseemail == 1) {
-				setProperty(ltiProps, BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, user.getEmail());
+				setProperty(ltiProps, LTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, user.getEmail());
 				setProperty(lti13subst, LTICustomVars.PERSON_EMAIL_PRIMARY, user.getEmail());
 				// Only send the display ID if it's different to the EID.
 				// the anonymous user has a null EID.
 				if (user.getEid() != null && !user.getEid().equals(user.getDisplayId())) {
-					setProperty(ltiProps, BasicLTIConstants.EXT_SAKAI_PROVIDER_DISPLAYID, user.getDisplayId());
+					setProperty(ltiProps, LTIConstants.EXT_SAKAI_PROVIDER_DISPLAYID, user.getDisplayId());
 				}
 			}
 		}
@@ -650,7 +650,7 @@ public static void addRoleInfo(Properties props, Properties lti13subst, User use
 
 		if ( outboundRole == null ) outboundRole = getFallBackRole(context);
 
-		setProperty(props, BasicLTIConstants.ROLES, outboundRole);
+		setProperty(props, LTIConstants.ROLES, outboundRole);
 		setProperty(lti13subst, LTICustomVars.MEMBERSHIP_ROLE, outboundRole);
 
 		// Check if there are sections the user is part of (may be more than one)
@@ -851,16 +851,16 @@ public static void addPlacementInfo(Properties props, String placementId) {
 		Properties normalProps = normalizePlacementProperties(placementId, ltiService);
 
 		// Start setting the Basici LTI parameters
-		setProperty(props, BasicLTIConstants.RESOURCE_LINK_ID, placementId);
+		setProperty(props, LTIConstants.RESOURCE_LINK_ID, placementId);
 		String title = toNull(getCorrectProperty(config, LTIService.LTI_TITLE, placement));
 		if ( title == null ) {
-			title = toNull(getCorrectProperty(config, BASICLTI_PORTLET_TOOLTITLE, placement));
+			title = toNull(getCorrectProperty(config, LTI_PORTLET_TOOLTITLE, placement));
 		}
 
 		if (title != null) {
-			setProperty(props, BasicLTIConstants.RESOURCE_LINK_TITLE, title);
+			setProperty(props, LTIConstants.RESOURCE_LINK_TITLE, title);
 		} else {
-			setProperty(props, BasicLTIConstants.RESOURCE_LINK_TITLE, placement.getTitle());
+			setProperty(props, LTIConstants.RESOURCE_LINK_TITLE, placement.getTitle());
 		}
 
 		String description = toNull(getCorrectProperty(config, LTIService.LTI_DESCRIPTION, placement));
@@ -869,13 +869,13 @@ public static void addPlacementInfo(Properties props, String placementId) {
 		}
 
 		if (description != null) {
-			setProperty(props, BasicLTIConstants.RESOURCE_LINK_DESCRIPTION, description);
+			setProperty(props, LTIConstants.RESOURCE_LINK_DESCRIPTION, description);
 		} else {
-			setProperty(props, BasicLTIConstants.RESOURCE_LINK_DESCRIPTION, placement.getTitle());
+			setProperty(props, LTIConstants.RESOURCE_LINK_DESCRIPTION, placement.getTitle());
 		}
 
-		String releasename = toNull(getCorrectProperty(config, BASICLTI_PORTLET_RELEASENAME, placement));
-		String releaseemail = toNull(getCorrectProperty(config, BASICLTI_PORTLET_RELEASEEMAIL, placement));
+		String releasename = toNull(getCorrectProperty(config, LTI_PORTLET_RELEASENAME, placement));
+		String releaseemail = toNull(getCorrectProperty(config, LTI_PORTLET_RELEASEEMAIL, placement));
 
 		User user = UserDirectoryService.getCurrentUser();
 
@@ -887,21 +887,21 @@ public static void addPlacementInfo(Properties props, String placementId) {
 			boolean isViewable = pm.isViewable("/site/" + context, user.getId());
 			setProperty(props, "ext_sakai_privacy", isViewable ? "visible" : "hidden");
 
-			setProperty(props, BasicLTIConstants.USER_ID, user.getId());
+			setProperty(props, LTIConstants.USER_ID, user.getId());
 
-			if (ServerConfigurationService.getBoolean(BASICLTI_CONSUMER_USERIMAGE_ENABLED, true)) {
+			if (ServerConfigurationService.getBoolean(LTI_CONSUMER_USERIMAGE_ENABLED, true)) {
 				String imageUrl = getOurServerUrl() + "/direct/profile/" + user.getId() + "/image";
-				setProperty(props, BasicLTIConstants.USER_IMAGE, imageUrl);
+				setProperty(props, LTIConstants.USER_IMAGE, imageUrl);
 			}
 
-			if (BASICLTI_PORTLET_ON.equals(releasename)) {
-				setProperty(props, BasicLTIConstants.LIS_PERSON_NAME_GIVEN, user.getFirstName());
-				setProperty(props, BasicLTIConstants.LIS_PERSON_NAME_FAMILY, user.getLastName());
-				setProperty(props, BasicLTIConstants.LIS_PERSON_NAME_FULL, user.getDisplayName());
+			if (LTI_PORTLET_ON.equals(releasename)) {
+				setProperty(props, LTIConstants.LIS_PERSON_NAME_GIVEN, user.getFirstName());
+				setProperty(props, LTIConstants.LIS_PERSON_NAME_FAMILY, user.getLastName());
+				setProperty(props, LTIConstants.LIS_PERSON_NAME_FULL, user.getDisplayName());
 			}
-			if (BASICLTI_PORTLET_ON.equals(releaseemail)) {
-				setProperty(props, BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, user.getEmail());
-				setProperty(props, BasicLTIConstants.LIS_PERSON_SOURCEDID, user.getEid());
+			if (LTI_PORTLET_ON.equals(releaseemail)) {
+				setProperty(props, LTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, user.getEmail());
+				setProperty(props, LTIConstants.LIS_PERSON_SOURCEDID, user.getEid());
 				setProperty(props, "ext_sakai_eid", user.getEid());
 			}
 
@@ -913,7 +913,7 @@ public static void addPlacementInfo(Properties props, String placementId) {
 			// server settings (i.e. an external tool never wants the outcomes
 			// UI shown because it simply does not handle outcomes).
 			String allowOutcomes = toNull(getCorrectProperty(config, LTIService.LTI_ALLOWOUTCOMES, placement));
-			if (!BASICLTI_PORTLET_OFF.equals(allowOutcomes)) {
+			if (!LTI_PORTLET_OFF.equals(allowOutcomes)) {
 				gradebookColumn = toNull(getCorrectProperty(config, "assignment", placement));
 				if (!outcomesEnabled()) {
 					allowOutcomes = null;
@@ -924,12 +924,12 @@ public static void addPlacementInfo(Properties props, String placementId) {
 
 			String result_sourcedid = getSourceDID(user, placement, config);
 
-			String theRole = props.getProperty(BasicLTIConstants.ROLES);
+			String theRole = props.getProperty(LTIConstants.ROLES);
 			if (result_sourcedid != null) {
 
 				if ("true".equals(allowOutcomes) && gradebookColumn != null) {
 					if (theRole.contains(LTICustomVars.MEMBERSHIP_ROLE_LEARNER)) {
-						setProperty(props, BasicLTIConstants.LIS_RESULT_SOURCEDID, result_sourcedid);
+						setProperty(props, LTIConstants.LIS_RESULT_SOURCEDID, result_sourcedid);
 					}
 					setProperty(props, "ext_outcome_data_values_accepted", "text");  // SAK-25696
 
@@ -939,14 +939,14 @@ public static void addPlacementInfo(Properties props, String placementId) {
 						outcome_url = getOurServerUrl() + LTI11_SERVICE_PATH;
 					}
 					setProperty(props, "ext_ims_lis_basic_outcome_url", outcome_url);
-					outcome_url = ServerConfigurationService.getString("lti.consumer." + BasicLTIConstants.LIS_OUTCOME_SERVICE_URL, null);
+					outcome_url = ServerConfigurationService.getString("lti.consumer." + LTIConstants.LIS_OUTCOME_SERVICE_URL, null);
 					if (outcome_url == null) {
 						outcome_url = getOurServerUrl() + LTI11_SERVICE_PATH;
 					}
-					setProperty(props, BasicLTIConstants.LIS_OUTCOME_SERVICE_URL, outcome_url);
+					setProperty(props, LTIConstants.LIS_OUTCOME_SERVICE_URL, outcome_url);
 				}
 
-				if (rosterEnabled() && BASICLTI_PORTLET_ON.equals(allowRoster) ) {
+				if (rosterEnabled() && LTI_PORTLET_ON.equals(allowRoster) ) {
 					setProperty(props, "ext_ims_lis_memberships_id", result_sourcedid);
 
 					String roster_url = ServerConfigurationService.getString("lti.consumer.ext_ims_lis_memberships_url", null);
@@ -974,7 +974,7 @@ public static void addPlacementInfo(Properties props, String placementId) {
 			// Send along the SAK-28125 encrypted session if requested
 			String encryptsession = toNull(getCorrectProperty(config, "ext_sakai_encrypted_session", placement));
 			String secret = toNull(getCorrectProperty(config, LTIService.LTI_SECRET, placement));
-			String key = toNull(getCorrectProperty(config, BASICLTI_PORTLET_KEY, placement));
+			String key = toNull(getCorrectProperty(config, LTI_PORTLET_KEY, placement));
 			if (secret != null && key != null && "true".equals(encryptsession)
 					&& !SecurityService.isSuperUser()) {
 
@@ -1010,29 +1010,29 @@ public static void addConsumerData(Properties props, Properties custom) {
 		// Get the organizational information
 		setProperty(custom, LTICustomVars.TOOLPLATFORMINSTANCE_GUID,
 				ServerConfigurationService.getString("lti.consumer_instance_guid", defaultName));
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INSTANCE_GUID,
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INSTANCE_GUID,
 				ServerConfigurationService.getString("lti.consumer_instance_guid", defaultName));
 
 		setProperty(custom,  LTICustomVars.TOOLPLATFORMINSTANCE_NAME,
 				ServerConfigurationService.getString("lti.consumer_instance_name", defaultName));
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INSTANCE_NAME,
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INSTANCE_NAME,
 				ServerConfigurationService.getString("lti.consumer_instance_name", defaultName));
 
 		setProperty(custom, LTICustomVars.TOOLPLATFORMINSTANCE_DESCRIPTION,
 				ServerConfigurationService.getString("lti.consumer_instance_description", defaultName));
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION,
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION,
 				ServerConfigurationService.getString("lti.consumer_instance_description", defaultName));
 
 		setProperty(custom, LTICustomVars.TOOLPLATFORMINSTANCE_URL,
 				ServerConfigurationService.getString("lti.consumer_instance_url",
 						ServerConfigurationService.getString("serverUrl", null)));
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INSTANCE_URL,
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INSTANCE_URL,
 				ServerConfigurationService.getString("lti.consumer_instance_url",
 						ServerConfigurationService.getString("serverUrl", null)));
 
 		setProperty(custom, LTICustomVars.TOOLPLATFORMINSTANCE_CONTACTEMAIL,
 				ServerConfigurationService.getString("lti.consumer_instance_contact_email", null));
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INSTANCE_CONTACT_EMAIL,
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INSTANCE_CONTACT_EMAIL,
 				ServerConfigurationService.getString("lti.consumer_instance_contact_email", null));
 
 	}
@@ -1064,7 +1064,7 @@ public static void addPropertyExtensionData(Properties props, Properties custom)
 	public static void addGlobalData(Site site, Properties props, Properties custom, ResourceLoader rb) {
 		if (rb != null) {
 			String locale = rb.getLocale().toString();
-			setProperty(props, BasicLTIConstants.LAUNCH_PRESENTATION_LOCALE, locale);
+			setProperty(props, LTIConstants.LAUNCH_PRESENTATION_LOCALE, locale);
 			setProperty(custom, LTICustomVars.MESSAGE_LOCALE, locale);
 		}
 
@@ -1076,20 +1076,20 @@ public static void addGlobalData(Site site, Properties props, Properties custom,
 		if (tool_css == null) {
 			tool_css = getOurServerUrl() + CSSUtils.getCssToolBase();
 		}
-		setProperty(props, BasicLTIConstants.LAUNCH_PRESENTATION_CSS_URL, tool_css);
+		setProperty(props, LTIConstants.LAUNCH_PRESENTATION_CSS_URL, tool_css);
 
 		// Send along the CSS URL list
 		String tool_css_all = ServerConfigurationService.getString("lti.consumer.ext_sakai_launch_presentation_css_url_all", null);
 		if (site != null && tool_css_all == null) {
 			tool_css_all = getOurServerUrl() + CSSUtils.getCssToolBase() + ',' + getOurServerUrl() + CSSUtils.getCssToolSkinCDN(CSSUtils.getSkinFromSite(site));
 		}
-		setProperty(props, "ext_sakai_" + BasicLTIConstants.LAUNCH_PRESENTATION_CSS_URL + "_list", tool_css_all);
+		setProperty(props, "ext_sakai_" + LTIConstants.LAUNCH_PRESENTATION_CSS_URL + "_list", tool_css_all);
 
 		// Let tools know we are coming from Sakai
 		String sakaiVersion = ServerConfigurationService.getString("version.sakai", "2");
 		setProperty(props, "ext_lms", "sakai-" + sakaiVersion);
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INFO_PRODUCT_FAMILY_CODE, "sakai");
-		setProperty(props, BasicLTIConstants.TOOL_CONSUMER_INFO_VERSION, sakaiVersion);
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INFO_PRODUCT_FAMILY_CODE, "sakai");
+		setProperty(props, LTIConstants.TOOL_CONSUMER_INFO_VERSION, sakaiVersion);
 
 		setProperty(custom, LTICustomVars.TOOLCONSUMERINFO_PRODUCTFAMILYCODE, "sakai"); // Old
 		setProperty(custom, LTICustomVars.TOOLCONSUMERINFO_VERSION, sakaiVersion); // Old
@@ -1118,7 +1118,7 @@ public static String[] postLaunchHTML(String descriptor, String contextId, Strin
 			}
 
 			Properties info = new Properties();
-			if (!BasicLTIUtil.parseDescriptor(info, launch, descriptor)) {
+			if (!LTIUtil.parseDescriptor(info, launch, descriptor)) {
 				return postError("<p>" + getRB(rb, "error.badxml.resource",
 						"Error, cannot parse descriptor for resource=") + resourceId + ".</p>");
 			}
@@ -1184,21 +1184,21 @@ public static String[] postLaunchHTML(Map<String, Object> content, Map<String, O
 			Properties ltiProps = new Properties();
 			Properties toolProps = new Properties();
 			Properties lti13subst = new Properties();
-			setProperty(ltiProps, BasicLTIConstants.LTI_VERSION, BasicLTIConstants.LTI_VERSION_1);
+			setProperty(ltiProps, LTIConstants.LTI_VERSION, LTIConstants.LTI_VERSION_1);
 			addGlobalData(site, ltiProps, lti13subst, rb);
 			addSiteInfo(ltiProps, lti13subst, site);
 			addRoleInfo(ltiProps, lti13subst, user, context, (String) tool.get(LTIService.LTI_ROLEMAP));
 			addUserInfo(ltiProps, lti13subst, user, tool);
 
 			String resource_link_id = getResourceLinkId(content);
-			setProperty(ltiProps, BasicLTIConstants.RESOURCE_LINK_ID, resource_link_id);
+			setProperty(ltiProps, LTIConstants.RESOURCE_LINK_ID, resource_link_id);
 
 			setProperty(toolProps, "launch_url", launch_url);
 			setProperty(toolProps, "state", state);  // So far LTI 1.3 only
 			setProperty(toolProps, "nonce", nonce);  // So far LTI 1.3 only
 
 			setProperty(toolProps, LTIService.LTI_SECRET, secret);
-			setProperty(toolProps, BASICLTI_PORTLET_KEY, key);
+			setProperty(toolProps, LTI_PORTLET_KEY, key);
 
 			int debug = getInt(tool.get(LTIService.LTI_DEBUG));
 			if (debug == 2) {
@@ -1220,7 +1220,7 @@ public static String[] postLaunchHTML(Map<String, Object> content, Map<String, O
 
 			// SAK-40044 - If there is no description, we fall back to the pre-21 description in JSON
 			String content_settings = (String) content.get(LTIService.LTI_SETTINGS);
-			JSONObject content_json = org.tsugi.basiclti.BasicLTIUtil.parseJSONObject(content_settings);
+			JSONObject content_json = org.tsugi.lti.LTIUtil.parseJSONObject(content_settings);
 			if (StringUtils.isBlank(description) ) {
 				description = (String) content_json.get(LTIService.LTI_DESCRIPTION);
 			}
@@ -1231,12 +1231,12 @@ public static String[] postLaunchHTML(Map<String, Object> content, Map<String, O
 			}
 
 			if (StringUtils.isNotBlank(title)) {
-				setProperty(ltiProps, BasicLTIConstants.RESOURCE_LINK_TITLE, title);
+				setProperty(ltiProps, LTIConstants.RESOURCE_LINK_TITLE, title);
 				setProperty(lti13subst, LTICustomVars.RESOURCELINK_TITLE, title);
 			}
 
 			if ( StringUtils.isNotBlank(description) ) {
-				setProperty(ltiProps, BasicLTIConstants.RESOURCE_LINK_DESCRIPTION, description);
+				setProperty(ltiProps, LTIConstants.RESOURCE_LINK_DESCRIPTION, description);
 				setProperty(lti13subst, LTICustomVars.RESOURCELINK_DESCRIPTION, description);
 			}
 
@@ -1270,7 +1270,7 @@ public static String[] postLaunchHTML(Map<String, Object> content, Map<String, O
 					allowoutcomes, allowroster, result_sourcedid);
 
 			if (result_sourcedid != null) {
-				String theRole = ltiProps.getProperty(BasicLTIConstants.ROLES);
+				String theRole = ltiProps.getProperty(LTIConstants.ROLES);
 				log.debug("theRole={}", theRole);
 				if (allowoutcomes == 1) {
 					setProperty(ltiProps, "ext_outcome_data_values_accepted", "text");  // SAK-25696
@@ -1280,14 +1280,14 @@ public static String[] postLaunchHTML(Map<String, Object> content, Map<String, O
 						outcome_url = getOurServerUrl() + LTI11_SERVICE_PATH;
 					}
 					setProperty(ltiProps, "ext_ims_lis_basic_outcome_url", outcome_url);
-					outcome_url = ServerConfigurationService.getString("lti.consumer." + BasicLTIConstants.LIS_OUTCOME_SERVICE_URL, null);
+					outcome_url = ServerConfigurationService.getString("lti.consumer." + LTIConstants.LIS_OUTCOME_SERVICE_URL, null);
 					if (outcome_url == null) {
 						outcome_url = getOurServerUrl() + LTI11_SERVICE_PATH;
 					}
-					setProperty(ltiProps, BasicLTIConstants.LIS_OUTCOME_SERVICE_URL, outcome_url);
+					setProperty(ltiProps, LTIConstants.LIS_OUTCOME_SERVICE_URL, outcome_url);
 
-					if (theRole.contains(BasicLTIConstants.MEMBERSHIP_ROLE_LEARNER)) {
-						setProperty(ltiProps, BasicLTIConstants.LIS_RESULT_SOURCEDID, result_sourcedid);
+					if (theRole.contains(LTIConstants.MEMBERSHIP_ROLE_LEARNER)) {
+						setProperty(ltiProps, LTIConstants.LIS_RESULT_SOURCEDID, result_sourcedid);
 					}
 				}
 
@@ -1450,7 +1450,7 @@ public static DeepLinkResponse getDeepLinkFromToken(Map<String, Object> tool, St
 			}
 
 			// May throw a RunTimeException on our behalf :)
-			Key publicKey = SakaiBLTIUtil.getPublicKey(tool, id_token);
+			Key publicKey = SakaiLTIUtil.getPublicKey(tool, id_token);
 
 			// Fill up the object, validate and return
 			DeepLinkResponse dlr = new DeepLinkResponse(id_token);
@@ -1495,18 +1495,18 @@ public static String[] postContentItemSelectionRequest(Long toolKey, Map<String,
 			// Start building up the properties
 			Properties ltiProps = new Properties();
 
-			setProperty(ltiProps, BasicLTIConstants.LTI_VERSION, BasicLTIConstants.LTI_VERSION_1);
-			setProperty(ltiProps, BasicLTIConstants.LTI_MESSAGE_TYPE, BasicLTIConstants.CONTENT_ITEM_SELECTION_REQUEST);
+			setProperty(ltiProps, LTIConstants.LTI_VERSION, LTIConstants.LTI_VERSION_1);
+			setProperty(ltiProps, LTIConstants.LTI_MESSAGE_TYPE, LTIConstants.CONTENT_ITEM_SELECTION_REQUEST);
 
 			setProperty(ltiProps, ContentItem.ACCEPT_MEDIA_TYPES, ContentItem.MEDIA_LTILINKITEM);
-			setProperty(ltiProps, BasicLTIConstants.ACCEPT_PRESENTATION_DOCUMENT_TARGETS, "iframe,window"); // Nice to add overlay
-			setProperty(ltiProps, BasicLTIConstants.ACCEPT_UNSIGNED, "false");
-			setProperty(ltiProps, BasicLTIConstants.ACCEPT_MULTIPLE, "false");
-			setProperty(ltiProps, BasicLTIConstants.ACCEPT_COPY_ADVICE, "false"); // ???
-			setProperty(ltiProps, BasicLTIConstants.AUTO_CREATE, "true");
-			setProperty(ltiProps, BasicLTIConstants.CAN_CONFIRM, "false");
-			// setProperty(ltiProps, BasicLTIConstants.TITLE, "");
-			// setProperty(ltiProps, BasicLTIConstants.TEXT, "");
+			setProperty(ltiProps, LTIConstants.ACCEPT_PRESENTATION_DOCUMENT_TARGETS, "iframe,window"); // Nice to add overlay
+			setProperty(ltiProps, LTIConstants.ACCEPT_UNSIGNED, "false");
+			setProperty(ltiProps, LTIConstants.ACCEPT_MULTIPLE, "false");
+			setProperty(ltiProps, LTIConstants.ACCEPT_COPY_ADVICE, "false"); // ???
+			setProperty(ltiProps, LTIConstants.AUTO_CREATE, "true");
+			setProperty(ltiProps, LTIConstants.CAN_CONFIRM, "false");
+			// setProperty(ltiProps, LTIConstants.TITLE, "");
+			// setProperty(ltiProps, LTIConstants.TEXT, "");
 
 			// Pull in additonal data
 			JSONObject dataJSON = new JSONObject();
@@ -1519,38 +1519,38 @@ public static String[] postContentItemSelectionRequest(Long toolKey, Map<String,
 				}
 
 				// Allow overrides
-				if (BasicLTIConstants.ACCEPT_MEDIA_TYPES.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.ACCEPT_MEDIA_TYPES, value);
+				if (LTIConstants.ACCEPT_MEDIA_TYPES.equals(key)) {
+					setProperty(ltiProps, LTIConstants.ACCEPT_MEDIA_TYPES, value);
 					continue;
-				} else if (BasicLTIConstants.ACCEPT_MULTIPLE.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.ACCEPT_MULTIPLE, value);
+				} else if (LTIConstants.ACCEPT_MULTIPLE.equals(key)) {
+					setProperty(ltiProps, LTIConstants.ACCEPT_MULTIPLE, value);
 					continue;
-				} else if (BasicLTIConstants.ACCEPT_PRESENTATION_DOCUMENT_TARGETS.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.ACCEPT_PRESENTATION_DOCUMENT_TARGETS, value);
+				} else if (LTIConstants.ACCEPT_PRESENTATION_DOCUMENT_TARGETS.equals(key)) {
+					setProperty(ltiProps, LTIConstants.ACCEPT_PRESENTATION_DOCUMENT_TARGETS, value);
 					continue;
-				} else if (BasicLTIConstants.ACCEPT_UNSIGNED.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.ACCEPT_UNSIGNED, value);
+				} else if (LTIConstants.ACCEPT_UNSIGNED.equals(key)) {
+					setProperty(ltiProps, LTIConstants.ACCEPT_UNSIGNED, value);
 					continue;
-				} else if (BasicLTIConstants.AUTO_CREATE.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.AUTO_CREATE, value);
+				} else if (LTIConstants.AUTO_CREATE.equals(key)) {
+					setProperty(ltiProps, LTIConstants.AUTO_CREATE, value);
 					continue;
-				} else if (BasicLTIConstants.CAN_CONFIRM.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.CAN_CONFIRM, value);
+				} else if (LTIConstants.CAN_CONFIRM.equals(key)) {
+					setProperty(ltiProps, LTIConstants.CAN_CONFIRM, value);
 					continue;
-				} else if (BasicLTIConstants.TITLE.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.TITLE, value);
+				} else if (LTIConstants.TITLE.equals(key)) {
+					setProperty(ltiProps, LTIConstants.TITLE, value);
 					continue;
-				} else if (BasicLTIConstants.TEXT.equals(key)) {
-					setProperty(ltiProps, BasicLTIConstants.TEXT, value);
+				} else if (LTIConstants.TEXT.equals(key)) {
+					setProperty(ltiProps, LTIConstants.TEXT, value);
 					continue;
 				}
 
 				// Pass in data for use to get back.
 				dataJSON.put(key, value);
 			}
-			setProperty(ltiProps, BasicLTIConstants.DATA, dataJSON.toString());
+			setProperty(ltiProps, LTIConstants.DATA, dataJSON.toString());
 
-			setProperty(ltiProps, BasicLTIConstants.CONTENT_ITEM_RETURN_URL, contentReturn);
+			setProperty(ltiProps, LTIConstants.CONTENT_ITEM_RETURN_URL, contentReturn);
 
 			// This must always be there
 			String context = (String) tool.get(LTIService.LTI_SITE_ID);
@@ -1579,9 +1579,9 @@ public static String[] postContentItemSelectionRequest(Long toolKey, Map<String,
 
 			// Don't sent the normal return URL when we are doing ContentItem launch
 			// Certification Issue
-			if (BasicLTIConstants.CONTENT_ITEM_SELECTION_REQUEST.equals(ltiProps.getProperty(BasicLTIConstants.LTI_MESSAGE_TYPE))) {
+			if (LTIConstants.CONTENT_ITEM_SELECTION_REQUEST.equals(ltiProps.getProperty(LTIConstants.LTI_MESSAGE_TYPE))) {
 
-				ltiProps.remove(BasicLTIConstants.LAUNCH_PRESENTATION_RETURN_URL);
+				ltiProps.remove(LTIConstants.LAUNCH_PRESENTATION_RETURN_URL);
 			}
 
 			boolean dodebug = getInt(tool.get(LTIService.LTI_DEBUG)) == 1;
@@ -1631,17 +1631,17 @@ public static String[] postContentItemSelectionRequest(Long toolKey, Map<String,
 			boolean autosubmit = !dodebug;
 
 			Map<String, String> extra = new HashMap<>();
-			extra.put(BasicLTIUtil.EXTRA_FORM_ID, submit_form_id);
-			extra.put(BasicLTIUtil.EXTRA_ERROR_TIMEOUT, rb.getString("error.submit.timeout"));
-			extra.put(BasicLTIUtil.EXTRA_HTTP_POPUP, BasicLTIUtil.EXTRA_HTTP_POPUP_FALSE);  // Don't bother opening in new window in protocol mismatch
-			extra.put(BasicLTIUtil.EXTRA_JAVASCRIPT, getLaunchJavaScript(submit_form_id, autosubmit));
-			ltiProps = BasicLTIUtil.signProperties(ltiProps, launch_url, "POST", consumerkey, secret, extra);
+			extra.put(LTIUtil.EXTRA_FORM_ID, submit_form_id);
+			extra.put(LTIUtil.EXTRA_ERROR_TIMEOUT, rb.getString("error.submit.timeout"));
+			extra.put(LTIUtil.EXTRA_HTTP_POPUP, LTIUtil.EXTRA_HTTP_POPUP_FALSE);  // Don't bother opening in new window in protocol mismatch
+			extra.put(LTIUtil.EXTRA_JAVASCRIPT, getLaunchJavaScript(submit_form_id, autosubmit));
+			ltiProps = LTIUtil.signProperties(ltiProps, launch_url, "POST", consumerkey, secret, extra);
 
 			log.debug("signed ltiProps={}", ltiProps);
 
 			String launchtext = getRB(rb, "launch.button", "Press to Launch External Tool");
 			autosubmit = false;  // We handle this in our JavaScript
-			String postData = BasicLTIUtil.postLaunchHTML(ltiProps, launch_url, launchtext, autosubmit, dodebug, extra);
+			String postData = LTIUtil.postLaunchHTML(ltiProps, launch_url, launchtext, autosubmit, dodebug, extra);
 
 			String[] retval = {postData, launch_url};
 			return retval;
@@ -1688,7 +1688,7 @@ public static String[] postLaunchHTML(Properties toolProps, Properties ltiProps,
 			}
 
 			// Look up the LMS-wide secret and key - default key is guid
-			String key = getToolConsumerInfo(launch_url, BASICLTI_PORTLET_KEY);
+			String key = getToolConsumerInfo(launch_url, LTI_PORTLET_KEY);
 			if (key == null) {
 				key = ServerConfigurationService.getString("lti.consumer_instance_guid",
 						ServerConfigurationService.getString("serverName", null));
@@ -1704,7 +1704,7 @@ public static String[] postLaunchHTML(Properties toolProps, Properties ltiProps,
 			// If we do not have LMS-wide info, use the local key/secret
 			if (secret == null) {
 				secret = toNull(toolProps.getProperty(LTIService.LTI_SECRET));
-				key = toNull(toolProps.getProperty(BASICLTI_PORTLET_KEY));
+				key = toNull(toolProps.getProperty(LTI_PORTLET_KEY));
 			}
 
 			// If secret is encrypted, decrypt it
@@ -1713,7 +1713,7 @@ public static String[] postLaunchHTML(Properties toolProps, Properties ltiProps,
 			// Pull in all of the custom parameters
 			for (Object okey : toolProps.keySet()) {
 				String skey = (String) okey;
-				if (!skey.startsWith(BasicLTIConstants.CUSTOM_PREFIX)) {
+				if (!skey.startsWith(LTIConstants.CUSTOM_PREFIX)) {
 					continue;
 				}
 				String value = toolProps.getProperty(skey);
@@ -1744,17 +1744,17 @@ public static String[] postLaunchHTML(Properties toolProps, Properties ltiProps,
 			addConsumerData(ltiProps, null);
 
 			String debugProperty = toolProps.getProperty(LTIService.LTI_DEBUG);
-			boolean dodebug = BASICLTI_PORTLET_ON.equals(debugProperty) || "1".equals(debugProperty);
+			boolean dodebug = LTI_PORTLET_ON.equals(debugProperty) || "1".equals(debugProperty);
 
 			String submit_form_id = java.util.UUID.randomUUID().toString() + "";
 			boolean autosubmit = !dodebug;
 
 			Map<String, String> extra = new HashMap<>();
-			extra.put(BasicLTIUtil.EXTRA_FORM_ID, submit_form_id);
-			extra.put(BasicLTIUtil.EXTRA_ERROR_TIMEOUT, rb.getString("error.submit.timeout"));
-			extra.put(BasicLTIUtil.EXTRA_HTTP_POPUP, BasicLTIUtil.EXTRA_HTTP_POPUP_FALSE);  // Don't bother opening in new window in protocol mismatch
-			extra.put(BasicLTIUtil.EXTRA_JAVASCRIPT, getLaunchJavaScript(submit_form_id, autosubmit));
-			ltiProps = BasicLTIUtil.signProperties(ltiProps, launch_url, "POST", key, secret, extra);
+			extra.put(LTIUtil.EXTRA_FORM_ID, submit_form_id);
+			extra.put(LTIUtil.EXTRA_ERROR_TIMEOUT, rb.getString("error.submit.timeout"));
+			extra.put(LTIUtil.EXTRA_HTTP_POPUP, LTIUtil.EXTRA_HTTP_POPUP_FALSE);  // Don't bother opening in new window in protocol mismatch
+			extra.put(LTIUtil.EXTRA_JAVASCRIPT, getLaunchJavaScript(submit_form_id, autosubmit));
+			ltiProps = LTIUtil.signProperties(ltiProps, launch_url, "POST", key, secret, extra);
 
 			if (ltiProps == null) {
 				return postError("<p>" + getRB(rb, "error.sign", "Error signing message.") + "</p>");
@@ -1763,7 +1763,7 @@ public static String[] postLaunchHTML(Properties toolProps, Properties ltiProps,
 
 			String launchtext = getRB(rb, "launch.button", "Press to Launch External Tool");
 			autosubmit = false;  // We handle this in our JavaScript
-			String postData = BasicLTIUtil.postLaunchHTML(ltiProps, launch_url, launchtext, autosubmit, dodebug, extra);
+			String postData = LTIUtil.postLaunchHTML(ltiProps, launch_url, launchtext, autosubmit, dodebug, extra);
 
 			String[] retval = {postData, launch_url};
 			return retval;
@@ -1872,8 +1872,8 @@ public static String[] postLaunchJWT(Properties toolProps, Properties ltiProps,
 	user_id: admin
 			 */
 
-			String context_id = ltiProps.getProperty(BasicLTIConstants.CONTEXT_ID);
-			String user_id = (String) ltiProps.getProperty(BasicLTIConstants.USER_ID);
+			String context_id = ltiProps.getProperty(LTIConstants.CONTEXT_ID);
+			String user_id = (String) ltiProps.getProperty(LTIConstants.USER_ID);
 
 			// Lets make a JWT from the LTI 1.x data
 			boolean deepLink = false;
@@ -1894,23 +1894,23 @@ public static String[] postLaunchJWT(Properties toolProps, Properties ltiProps,
 			} else if ( MESSAGE_TYPE_PARAMETER_CONTENT_REVIEW.equals(messageTypeParm)) {
 				lj.message_type = LaunchJWT.MESSAGE_TYPE_LTI_SUBMISSION_REVIEW_REQUEST;
 				if ( sakaiLineItem != null && sakaiLineItem.submissionReview != null && StringUtils.isNotEmpty(sakaiLineItem.submissionReview.url) ) lj.target_link_uri = sakaiLineItem.submissionReview.url;
-			} else if ( BasicLTIConstants.LTI_MESSAGE_TYPE_CONTENTITEMSELECTIONREQUEST.equals(ltiProps.getProperty(BasicLTIConstants.LTI_MESSAGE_TYPE)) ) {
+			} else if ( LTIConstants.LTI_MESSAGE_TYPE_CONTENTITEMSELECTIONREQUEST.equals(ltiProps.getProperty(LTIConstants.LTI_MESSAGE_TYPE)) ) {
 				lj.message_type = LaunchJWT.MESSAGE_TYPE_DEEP_LINK;
 				deepLink = true;
 			}
 
-			lj.launch_presentation.css_url = ltiProps.getProperty(BasicLTIConstants.LAUNCH_PRESENTATION_CSS_URL);
-			lj.locale = ltiProps.getProperty(BasicLTIConstants.LAUNCH_PRESENTATION_LOCALE);
-			lj.launch_presentation.return_url = ltiProps.getProperty(BasicLTIConstants.LAUNCH_PRESENTATION_RETURN_URL);
+			lj.launch_presentation.css_url = ltiProps.getProperty(LTIConstants.LAUNCH_PRESENTATION_CSS_URL);
+			lj.locale = ltiProps.getProperty(LTIConstants.LAUNCH_PRESENTATION_LOCALE);
+			lj.launch_presentation.return_url = ltiProps.getProperty(LTIConstants.LAUNCH_PRESENTATION_RETURN_URL);
 			lj.audience = client_id;
 			lj.issuer = getIssuer(site_id);
 			lj.subject = getSubject(user_id, context_id);
 
 			// The name and email info have been checked for release value in addUserInfo
-			lj.name = ltiProps.getProperty(BasicLTIConstants.LIS_PERSON_NAME_FULL);
-			lj.given_name = ltiProps.getProperty(BasicLTIConstants.LIS_PERSON_NAME_GIVEN);
-			lj.family_name = ltiProps.getProperty(BasicLTIConstants.LIS_PERSON_NAME_FAMILY);
-			lj.email = ltiProps.getProperty(BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY);
+			lj.name = ltiProps.getProperty(LTIConstants.LIS_PERSON_NAME_FULL);
+			lj.given_name = ltiProps.getProperty(LTIConstants.LIS_PERSON_NAME_GIVEN);
+			lj.family_name = ltiProps.getProperty(LTIConstants.LIS_PERSON_NAME_FAMILY);
+			lj.email = ltiProps.getProperty(LTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY);
 
 			lj.nonce = toolProps.getProperty("nonce");
 			lj.issued = new Long(System.currentTimeMillis() / 1000L);
@@ -1926,12 +1926,12 @@ public static String[] postLaunchJWT(Properties toolProps, Properties ltiProps,
 				lj.roles.add(LaunchJWT.ROLE_LEARNER);
 			}
 
-			String resource_link_id = ltiProps.getProperty(BasicLTIConstants.RESOURCE_LINK_ID);
+			String resource_link_id = ltiProps.getProperty(LTIConstants.RESOURCE_LINK_ID);
 			if ( resource_link_id != null ) {
 				lj.resource_link = new ResourceLink();
 				lj.resource_link.id = resource_link_id;
-				lj.resource_link.title = ltiProps.getProperty(BasicLTIConstants.RESOURCE_LINK_TITLE);
-				lj.resource_link.description = ltiProps.getProperty(BasicLTIConstants.RESOURCE_LINK_DESCRIPTION);
+				lj.resource_link.title = ltiProps.getProperty(LTIConstants.RESOURCE_LINK_TITLE);
+				lj.resource_link.description = ltiProps.getProperty(LTIConstants.RESOURCE_LINK_DESCRIPTION);
 			}
 
 			// Construct the LTI 1.1 -> LTIAdvantage transition claim
@@ -1954,23 +1954,23 @@ public static String[] postLaunchJWT(Properties toolProps, Properties ltiProps,
 			// Load up the context data
 			lj.context = new Context();
 			lj.context.id = context_id;
-			lj.context.label = ltiProps.getProperty(BasicLTIConstants.CONTEXT_LABEL);
-			lj.context.title = ltiProps.getProperty(BasicLTIConstants.CONTEXT_TITLE);
+			lj.context.label = ltiProps.getProperty(LTIConstants.CONTEXT_LABEL);
+			lj.context.title = ltiProps.getProperty(LTIConstants.CONTEXT_TITLE);
 			lj.context.type.add(Context.COURSE_OFFERING);
 
 			lj.tool_platform = new ToolPlatform();
 			lj.tool_platform.name = "Sakai";
-			lj.tool_platform.guid = ltiProps.getProperty(BasicLTIConstants.TOOL_CONSUMER_INSTANCE_GUID, "guid-missing-42");
+			lj.tool_platform.guid = ltiProps.getProperty(LTIConstants.TOOL_CONSUMER_INSTANCE_GUID, "guid-missing-42");
 
-			lj.tool_platform.version = ltiProps.getProperty(BasicLTIConstants.TOOL_CONSUMER_INFO_VERSION);
-			lj.tool_platform.product_family_code = ltiProps.getProperty(BasicLTIConstants.TOOL_CONSUMER_INFO_PRODUCT_FAMILY_CODE);
-			lj.tool_platform.url = ltiProps.getProperty(BasicLTIConstants.TOOL_CONSUMER_INSTANCE_URL);
-			lj.tool_platform.description = ltiProps.getProperty(BasicLTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION);
+			lj.tool_platform.version = ltiProps.getProperty(LTIConstants.TOOL_CONSUMER_INFO_VERSION);
+			lj.tool_platform.product_family_code = ltiProps.getProperty(LTIConstants.TOOL_CONSUMER_INFO_PRODUCT_FAMILY_CODE);
+			lj.tool_platform.url = ltiProps.getProperty(LTIConstants.TOOL_CONSUMER_INSTANCE_URL);
+			lj.tool_platform.description = ltiProps.getProperty(LTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION);
 
 			LaunchLIS lis = new LaunchLIS();
-			lis.person_sourcedid = ltiProps.getProperty(BasicLTIConstants.LIS_PERSON_SOURCEDID);
-			lis.course_offering_sourcedid = ltiProps.getProperty(BasicLTIConstants.LIS_COURSE_OFFERING_SOURCEDID);
-			lis.course_section_sourcedid = ltiProps.getProperty(BasicLTIConstants.LIS_COURSE_SECTION_SOURCEDID);
+			lis.person_sourcedid = ltiProps.getProperty(LTIConstants.LIS_PERSON_SOURCEDID);
+			lis.course_offering_sourcedid = ltiProps.getProperty(LTIConstants.LIS_COURSE_OFFERING_SOURCEDID);
+			lis.course_section_sourcedid = ltiProps.getProperty(LTIConstants.LIS_COURSE_SECTION_SOURCEDID);
 			lis.version = new ArrayList<>();
 			lis.version.add("1.0.0");
 			lis.version.add("1.1.0");
@@ -2128,7 +2128,7 @@ public static String[] postLaunchJWT(Properties toolProps, Properties ltiProps,
 				// Accept_unsigned is not in DeepLinking - they are signed JWTs
 				ci.auto_create = "true".equals(ltiProps.getProperty("auto_create"));
 				// can_confirm is not there
-				ci.deep_link_return_url = ltiProps.getProperty(BasicLTIConstants.CONTENT_ITEM_RETURN_URL);
+				ci.deep_link_return_url = ltiProps.getProperty(LTIConstants.CONTENT_ITEM_RETURN_URL);
 				ci.data = ltiProps.getProperty("data");
 				lj.deep_link = ci;
 			}
@@ -2152,7 +2152,7 @@ public static String[] postLaunchJWT(Properties toolProps, Properties ltiProps,
 			log.debug("jws = {}", jws);
 
 			String debugProperty = toolProps.getProperty(LTIService.LTI_DEBUG);
-			boolean dodebug = BASICLTI_PORTLET_ON.equals(debugProperty) || "1".equals(debugProperty);
+			boolean dodebug = LTI_PORTLET_ON.equals(debugProperty) || "1".equals(debugProperty);
 
 			String state = toolProps.getProperty("state");
 			state = StringUtils.trimToNull(state);
@@ -2181,11 +2181,11 @@ public static String getJwsHTMLForm(String launch_url, String form_field, String
 			StringBuffer sb = new StringBuffer();
 
 			sb.append("<form action=\"" + launch_url + "\" id=\""+ submit_form_id + "\" method=\"POST\">\n");
-			sb.append("    <input type=\"hidden\" name=\""+form_field+"\" value=\"" + BasicLTIUtil.htmlspecialchars(jwt) + "\" />\n");
+			sb.append("    <input type=\"hidden\" name=\""+form_field+"\" value=\"" + LTIUtil.htmlspecialchars(jwt) + "\" />\n");
 			sb.append("    <input type=\"hidden\" name=\"lti_storage_target\" value=\"_parent\" />\n");
 
 			if ( state != null ) {
-				sb.append("    <input type=\"hidden\" name=\"state\" value=\"" + BasicLTIUtil.htmlspecialchars(state) + "\" />\n");
+				sb.append("    <input type=\"hidden\" name=\"state\" value=\"" + LTIUtil.htmlspecialchars(state) + "\" />\n");
 			}
 
 			if ( dodebug ) {
@@ -2195,15 +2195,15 @@ public static String getJwsHTMLForm(String launch_url, String form_field, String
 
 			if ( dodebug ) {
 				sb.append("<p>\n--- Unencoded JWT:<br/><pre>\n");
-				sb.append(BasicLTIUtil.htmlspecialchars(jsonStr));
+				sb.append(LTIUtil.htmlspecialchars(jsonStr));
 				sb.append("</pre>\n</p>\n<p>\n--- State:<br/>");
-				sb.append(BasicLTIUtil.htmlspecialchars(state));
+				sb.append(LTIUtil.htmlspecialchars(state));
 				sb.append("</p>\n<p>\n--- Encoded JWT:<br/>");
-				sb.append(BasicLTIUtil.htmlspecialchars(jwt));
+				sb.append(LTIUtil.htmlspecialchars(jwt));
 				sb.append("</p>\n");
 			} else {
 				sb.append("<script>\n");
-				sb.append("setTimeout(function() { alert(\""+BasicLTIUtil.htmlspecialchars(launch_error)+"\"); }, 4000);\n");
+				sb.append("setTimeout(function() { alert(\""+LTIUtil.htmlspecialchars(launch_error)+"\"); }, 4000);\n");
 				sb.append("</script>\n");
 			}
 
@@ -2217,7 +2217,7 @@ public static String getJwsHTMLForm(String launch_url, String form_field, String
 		}
 
 		public static String getSourceDID(User user, Placement placement, Properties config) {
-			String placementSecret = toNull(getCorrectProperty(config, BASICLTI_PORTLET_PLACEMENTSECRET, placement));
+			String placementSecret = toNull(getCorrectProperty(config, LTI_PORTLET_PLACEMENTSECRET, placement));
 			if (placementSecret == null) {
 				return null;
 			}
@@ -2270,12 +2270,12 @@ public static String trackResourceLinkID(Map<String, Object> oldContent) {
 			boolean retval = false;
 
 			String old_settings = (String) oldContent.get(LTIService.LTI_SETTINGS);
-			JSONObject old_json = BasicLTIUtil.parseJSONObject(old_settings);
+			JSONObject old_json = LTIUtil.parseJSONObject(old_settings);
 			String old_id_history = (String) old_json.get(LTIService.LTI_ID_HISTORY);
 
 			String old_resource_link_id = getResourceLinkId(oldContent);
 
-			String id_history = BasicLTIUtil.mergeCSV(old_id_history, null, old_resource_link_id);
+			String id_history = LTIUtil.mergeCSV(old_id_history, null, old_resource_link_id);
 			return id_history;
 		}
 
@@ -2283,16 +2283,16 @@ public static boolean trackResourceLinkID(Map<String, Object> newContent, Map<St
 			boolean retval = false;
 
 			String old_settings = (String) oldContent.get(LTIService.LTI_SETTINGS);
-			JSONObject old_json = BasicLTIUtil.parseJSONObject(old_settings);
+			JSONObject old_json = LTIUtil.parseJSONObject(old_settings);
 			String old_id_history = (String) old_json.get(LTIService.LTI_ID_HISTORY);
 
 			String new_settings = (String) newContent.get(LTIService.LTI_SETTINGS);
-			JSONObject new_json = BasicLTIUtil.parseJSONObject(new_settings);
+			JSONObject new_json = LTIUtil.parseJSONObject(new_settings);
 			String new_id_history = (String) new_json.get(LTIService.LTI_ID_HISTORY);
 
 			String old_resource_link_id = getResourceLinkId(oldContent);
 
-			String id_history = BasicLTIUtil.mergeCSV(old_id_history, new_id_history, old_resource_link_id);
+			String id_history = LTIUtil.mergeCSV(old_id_history, new_id_history, old_resource_link_id);
 			if ( id_history.equals(new_id_history) ) return false;
 
 			new_json.put(LTIService.LTI_ID_HISTORY, id_history);
@@ -2384,7 +2384,7 @@ private static String getToolConsumerInfo(String launchUrl, String data) {
 		public static Object validateMessage(HttpServletRequest request, String URL,
 				String oauth_secret, String expected_oauth_key) {
 			oauth_secret = decryptSecret(oauth_secret);
-			return BasicLTIUtil.validateMessage(request, URL, oauth_secret, expected_oauth_key);
+			return LTIUtil.validateMessage(request, URL, oauth_secret, expected_oauth_key);
 		}
 
 		// Returns:
@@ -2517,7 +2517,7 @@ private static Object handleGradebook(String sourcedid, HttpServletRequest reque
 		}
 
 		// Make sure the placement is configured to receive grades
-		String title = normalProps.getProperty(BASICLTI_PORTLET_ASSIGNMENT);
+		String title = normalProps.getProperty(LTI_PORTLET_ASSIGNMENT);
 		log.debug("Column Title={}", title);
 		if (title == null) {
 			return "Gradebook column not set in placement";
@@ -2946,10 +2946,10 @@ public static String getRoundedGrade(Double scoreGiven, Double points) throws Ex
 	public static Properties normalizePlacementProperties(String placement_id, LTIService ltiService) {
 		// These are the fields from a placement - they are not an exact match
 		// for the fields in tool/content
-		String[] fieldList = {BASICLTI_PORTLET_KEY, LTIService.LTI_SECRET, BASICLTI_PORTLET_PLACEMENTSECRET,
-			BASICLTI_PORTLET_OLDPLACEMENTSECRET, 
-			BASICLTI_PORTLET_ASSIGNMENT, BASICLTI_PORTLET_ALLOWROSTER, BASICLTI_PORTLET_RELEASENAME, BASICLTI_PORTLET_RELEASEEMAIL,
-			BASICLTI_PORTLET_TOOLSETTING};
+		String[] fieldList = {LTI_PORTLET_KEY, LTIService.LTI_SECRET, LTI_PORTLET_PLACEMENTSECRET,
+			LTI_PORTLET_OLDPLACEMENTSECRET, 
+			LTI_PORTLET_ASSIGNMENT, LTI_PORTLET_ALLOWROSTER, LTI_PORTLET_RELEASENAME, LTI_PORTLET_RELEASEEMAIL,
+			LTI_PORTLET_TOOLSETTING};
 
 		Properties retval = new Properties();
 
@@ -2969,30 +2969,30 @@ public static Properties normalizePlacementProperties(String placement_id, LTISe
 			retval.setProperty(LTIService.LTI_SITE_ID, siteId);
 			for (String field : fieldList) {
 				String value = toNull(getCorrectProperty(config, field, placement));
-				if (field.equals(BASICLTI_PORTLET_ALLOWROSTER)) {
+				if (field.equals(LTI_PORTLET_ALLOWROSTER)) {
 					field = LTIService.LTI_ALLOWROSTER;
 				}
-				if (field.equals(BASICLTI_PORTLET_ASSIGNMENT)) {
+				if (field.equals(LTI_PORTLET_ASSIGNMENT)) {
 					String outval = outcomesEnabled() && StringUtils.isNotEmpty(value) ? "1" : "0";
 				}
-				if (field.equals(BASICLTI_PORTLET_RELEASENAME)) {
+				if (field.equals(LTI_PORTLET_RELEASENAME)) {
 					field = LTIService.LTI_SENDNAME;
 				}
-				if (field.equals(BASICLTI_PORTLET_RELEASEEMAIL)) {
+				if (field.equals(LTI_PORTLET_RELEASEEMAIL)) {
 					field = LTIService.LTI_SENDEMAILADDR;
 				}
 				// These field names are the same but for completeness..
-				if (field.equals(BASICLTI_PORTLET_OLDPLACEMENTSECRET)) {
+				if (field.equals(LTI_PORTLET_OLDPLACEMENTSECRET)) {
 					field = LTIService.LTI_OLDPLACEMENTSECRET;
 				}
 				// These field names are the same but for completeness..
-				if (field.equals(BASICLTI_PORTLET_PLACEMENTSECRET)) {
+				if (field.equals(LTI_PORTLET_PLACEMENTSECRET)) {
 					field = LTIService.LTI_PLACEMENTSECRET;
 				}
 				if (value == null) {
 					continue;
 				}
-				if (field.equals(BASICLTI_PORTLET_KEY)) {
+				if (field.equals(LTI_PORTLET_KEY)) {
 					field = LTIService.LTI_CONSUMERKEY;
 				}
 				retval.setProperty(field, value);
@@ -3045,9 +3045,9 @@ public static Properties normalizePlacementProperties(String placement_id, LTISe
 				if ("checkbox".equals(type)) {
 					int check = getInt(o);
 					if (check == 1) {
-						retval.setProperty(field, BASICLTI_PORTLET_ON);
+						retval.setProperty(field, LTI_PORTLET_ON);
 					} else {
-						retval.setProperty(field, BASICLTI_PORTLET_OFF);
+						retval.setProperty(field, LTI_PORTLET_OFF);
 					}
 				}
 			}
@@ -3064,14 +3064,14 @@ public static Properties normalizePlacementProperties(String placement_id, LTISe
 				if ("checkbox".equals(type)) {
 					int check = getInt(o);
 					if (check == 1) {
-						retval.setProperty(field, BASICLTI_PORTLET_ON);
+						retval.setProperty(field, LTI_PORTLET_ON);
 					} else {
-						retval.setProperty(field, BASICLTI_PORTLET_OFF);
+						retval.setProperty(field, LTI_PORTLET_OFF);
 					}
 				}
 			}
 			String aTitle = (String) content.get("title");
-			retval.setProperty(BASICLTI_PORTLET_ASSIGNMENT, aTitle.trim());
+			retval.setProperty(LTI_PORTLET_ASSIGNMENT, aTitle.trim());
 		}
 		return retval;
 	}
@@ -3175,7 +3175,7 @@ public static boolean isPlacement(String placement_id) {
 	// Since ServerConfigurationService.getServerUrl() is wonky because it sometimes looks
 	// at request.getServerName() instead of the serverUrl property we have our own
 	// priority to determine our current url.
-	// BLTI-273
+	// LTI-273
 	public static String getOurServerUrl() {
 		String ourUrl = ServerConfigurationService.getString("sakai.lti.serverUrl");
 		if (ourUrl == null || ourUrl.equals("")) {
@@ -3461,10 +3461,10 @@ public static Object copyLTIContent(Map<String, Object> ltiContent, String siteI
 
 		// Track the resource_link_history
 		Map<String, Object> updates = new HashMap<String, Object> ();
-		String id_history = SakaiBLTIUtil.trackResourceLinkID(ltiContent);
+		String id_history = SakaiLTIUtil.trackResourceLinkID(ltiContent);
 		if ( StringUtils.isNotBlank(id_history) ) {
 			String new_settings = (String) contentProps.get(LTIService.LTI_SETTINGS);
-			JSONObject new_json = BasicLTIUtil.parseJSONObject(new_settings);
+			JSONObject new_json = LTIUtil.parseJSONObject(new_settings);
 			new_json.put(LTIService.LTI_ID_HISTORY, id_history);
 			contentProps.put(LTIService.LTI_SETTINGS, new_json.toString());
 		}
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SimpleEncryption.java b/lti/lti-common/src/java/org/sakaiproject/lti/util/SimpleEncryption.java
similarity index 99%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SimpleEncryption.java
rename to lti/lti-common/src/java/org/sakaiproject/lti/util/SimpleEncryption.java
index 541413b93016..02ffb9f39975 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SimpleEncryption.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti/util/SimpleEncryption.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.security.AlgorithmParameters;
 import java.security.NoSuchAlgorithmException;
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/LineItemUtil.java b/lti/lti-common/src/java/org/sakaiproject/lti13/LineItemUtil.java
similarity index 95%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/lti13/LineItemUtil.java
rename to lti/lti-common/src/java/org/sakaiproject/lti13/LineItemUtil.java
index 54ad948a7cad..d47c5bdf60b3 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/LineItemUtil.java
+++ b/lti/lti-common/src/java/org/sakaiproject/lti13/LineItemUtil.java
@@ -29,16 +29,16 @@
 
 import org.json.simple.JSONObject;
 
-import org.tsugi.basiclti.ContentItem;
+import org.tsugi.lti.ContentItem;
 import org.tsugi.lti13.DeepLinkResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.extern.slf4j.Slf4j;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.cover.SecurityService;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.LTI13_PATH;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.getOurServerUrl;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI13_PATH;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.getOurServerUrl;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.component.cover.ComponentManager;
@@ -50,12 +50,12 @@
 import org.sakaiproject.grading.api.Assignment;
 import org.sakaiproject.lti13.util.SakaiLineItem;
 
-import static org.tsugi.basiclti.BasicLTIUtil.getObject;
-import static org.tsugi.basiclti.BasicLTIUtil.parseIMS8601;
+import static org.tsugi.lti.LTIUtil.getObject;
+import static org.tsugi.lti.LTIUtil.parseIMS8601;
 
 /**
  * Some Sakai Utility code for IMS LTI This is mostly code to support the
- * Sakai conventions for making and launching BLTI resources within Sakai.
+ * Sakai conventions for making and launching LTI resources within Sakai.
  */
 @SuppressWarnings("deprecation")
 @Slf4j
@@ -90,7 +90,7 @@ public static String URLEncode(String inp) {
 	 */
 	public static String constructExternalId(Map<String, Object> content, SakaiLineItem lineItem)
 	{
-		Long tool_id = SakaiBLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID));
+		Long tool_id = SakaiLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID));
 		return constructExternalId(tool_id, content, lineItem);
 	}
 
@@ -277,7 +277,7 @@ public static Assignment updateLineItem(Site site, Long tool_id, Long column_id,
 		gradebookColumn.setReleased(releaseToStudent); // default true
 		gradebookColumn.setCounted(includeInComputation); // default true
 		gradebookColumn.setUngraded(false);
-		Date dueDate = org.tsugi.basiclti.BasicLTIUtil.parseIMS8601(lineItem.endDateTime);
+		Date dueDate = org.tsugi.lti.LTIUtil.parseIMS8601(lineItem.endDateTime);
 		if ( dueDate != null ) gradebookColumn.setDueDate(dueDate);
 
 		pushAdvisor();
@@ -497,7 +497,7 @@ public static SakaiLineItem getLineItem(String signed_placement, Assignment assi
 		li.scoreMaximum = assignment.getPoints();
 		Date dueDate = assignment.getDueDate();
 		if ( dueDate != null ) {
-			li.endDateTime = org.tsugi.basiclti.BasicLTIUtil.getISO8601(dueDate);
+			li.endDateTime = org.tsugi.lti.LTIUtil.getISO8601(dueDate);
 		}
 
 		// Parse the external_id
@@ -522,10 +522,10 @@ public static SakaiLineItem getLineItem(String signed_placement, Assignment assi
 	 * a line item when a score is first received
 	 */
 	public static SakaiLineItem constructLineItem(Map<String, Object> content) {
-		String signed_placement = SakaiBLTIUtil.getSignedPlacement(content);
+		String signed_placement = SakaiLTIUtil.getSignedPlacement(content);
 		SakaiLineItem li = new SakaiLineItem();
 		li.label = (String) content.get(LTIService.LTI_TITLE);
-		li.resourceLinkId = SakaiBLTIUtil.getResourceLinkId(content);
+		li.resourceLinkId = SakaiLTIUtil.getResourceLinkId(content);
 		if ( signed_placement != null ) {
 			li.id = getOurServerUrl() + LTI13_PATH + "lineitem/" + signed_placement;
 		}
@@ -539,8 +539,8 @@ public static SakaiLineItem constructLineItem(Map<String, Object> content) {
 	 * the "generic" endpoint that will create the lineitem upon first receipt of a score.
 	 */
 	public static SakaiLineItem getDefaultLineItem(Site site, Map<String, Object> content) {
-		String signed_placement = SakaiBLTIUtil.getSignedPlacement(content);
-		Long tool_id = SakaiBLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID));
+		String signed_placement = SakaiLTIUtil.getSignedPlacement(content);
+		Long tool_id = SakaiLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID));
 		List<SakaiLineItem> toolItems = LineItemUtil.getLineItemsForTool(signed_placement, site, tool_id, null /* filter */);
 		String title = (String) content.get(LTIService.LTI_TITLE);
 		for (SakaiLineItem item : toolItems) {
@@ -564,7 +564,7 @@ public static SakaiLineItem getDefaultLineItem(Site site, Map<String, Object> co
 	public static SakaiLineItem extractLineItem(String response_str) {
 
 
-		JSONObject response = org.tsugi.basiclti.BasicLTIUtil.parseJSONObject(response_str);
+		JSONObject response = org.tsugi.lti.LTIUtil.parseJSONObject(response_str);
 		if ( response == null ) return null;
 
 		// Check if this a DeepLinkResponse
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiAccessToken.java b/lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiAccessToken.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiAccessToken.java
rename to lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiAccessToken.java
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiDeepLink.java b/lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiDeepLink.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiDeepLink.java
rename to lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiDeepLink.java
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiExtension.java b/lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiExtension.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiExtension.java
rename to lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiExtension.java
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiLaunchJWT.java b/lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiLaunchJWT.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiLaunchJWT.java
rename to lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiLaunchJWT.java
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiLineItem.java b/lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiLineItem.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/lti13/util/SakaiLineItem.java
rename to lti/lti-common/src/java/org/sakaiproject/lti13/util/SakaiLineItem.java
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java b/lti/lti-common/src/java/org/sakaiproject/util/foorm/Foorm.java
similarity index 99%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java
rename to lti/lti-common/src/java/org/sakaiproject/util/foorm/Foorm.java
index a13e48c55518..12830e7d3f7b 100644
--- a/basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java
+++ b/lti/lti-common/src/java/org/sakaiproject/util/foorm/Foorm.java
@@ -1915,7 +1915,7 @@ public String formSql(String fieldinfo, String vendor) {
 		if (schema == null)
 			return null;
 
-		// BLTI-220 - This makes migrations challenging, adding columns
+		// LTI-220 - This makes migrations challenging, adding columns
 		// With no data - the software can still enforce required - but	
 		// we leave it up to the insert and update code
 		//if ("true".equals(required) && !(schema.indexOf("NOT NULL") > 0))
@@ -1991,7 +1991,7 @@ public String[] formAdjustTable(String table, String[] formDefinition, String ve
 
 			String ff = formSql(formField, vendor);
 
-			// BLTI-220, BLTI-238 - Required will be enforced in software - not the DB
+			// LTI-220, LTI-238 - Required will be enforced in software - not the DB
 			boolean shouldAlter = false;
 			if ("key".equals(type)) {
 				if ( ! NUMBER_TYPE.equals(sqlType) ) log.warn("{} must be Integer and Auto Increment", field);
@@ -2005,7 +2005,7 @@ public String[] formAdjustTable(String table, String[] formDefinition, String ve
 					continue;
 				}
 				if ( sqlLength < maxlength ) shouldAlter = true;
-				if ( ! isNullable ) shouldAlter = true; // BLTI-220, BLTI-238
+				if ( ! isNullable ) shouldAlter = true; // LTI-220, LTI-238
 
 				// shouldAlter = true; // Temporary SAK-31695 to force ALTER statements to be emitted
 
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java b/lti/lti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java
similarity index 100%
rename from basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java
rename to lti/lti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java
diff --git a/basiclti/basiclti-common/src/main/resources/META-INF/LICENSE b/lti/lti-common/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from basiclti/basiclti-common/src/main/resources/META-INF/LICENSE
rename to lti/lti-common/src/main/resources/META-INF/LICENSE
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/BlowFishTest.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/BlowFishTest.java
similarity index 96%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/BlowFishTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/BlowFishTest.java
index 42aa2af898d5..fee8b8ba9c7e 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/BlowFishTest.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/BlowFishTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,8 +25,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sakaiproject.basiclti.util.BlowFish;
-import org.sakaiproject.basiclti.util.PortableShaUtil;
+import org.sakaiproject.lti.util.BlowFish;
+import org.sakaiproject.lti.util.PortableShaUtil;
 
 @Slf4j
 public class BlowFishTest {
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/ByteToHexAndBack.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/ByteToHexAndBack.java
similarity index 94%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/ByteToHexAndBack.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/ByteToHexAndBack.java
index 5703084eea2d..ba51a3499d55 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/ByteToHexAndBack.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/ByteToHexAndBack.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sakaiproject.basiclti.util.LegacyShaUtil;
+import org.sakaiproject.lti.util.LegacyShaUtil;
 
 
 public class ByteToHexAndBack {
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/LegacyShaUtilTest.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/LegacyShaUtilTest.java
similarity index 95%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/LegacyShaUtilTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/LegacyShaUtilTest.java
index d62f8fddc8b7..edb056065ad3 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/LegacyShaUtilTest.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/LegacyShaUtilTest.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sakaiproject.basiclti.util.LegacyShaUtil;
+import org.sakaiproject.lti.util.LegacyShaUtil;
 
 /* SAK-28122 - 
- * org.sakaiproject.basiclti.util.ShaUtil hexadecimal mapping is not compatible cross-language
+ * org.sakaiproject.lti.util.ShaUtil hexadecimal mapping is not compatible cross-language
  * 
  * This is testing the legacy SHA1 and SHA256 routines which use a non-standard
  * byteToHex and hexToByte mapping.
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/PortableShaUtilTest.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/PortableShaUtilTest.java
similarity index 96%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/PortableShaUtilTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/PortableShaUtilTest.java
index 40001737ea11..459b8ba23e68 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/PortableShaUtilTest.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/PortableShaUtilTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sakaiproject.basiclti.util.PortableShaUtil;
+import org.sakaiproject.lti.util.PortableShaUtil;
 
 
 public class PortableShaUtilTest {
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiKeySetUtilTest.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiKeySetUtilTest.java
similarity index 96%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiKeySetUtilTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiKeySetUtilTest.java
index fc77b5bbadac..c3120e41cc24 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiKeySetUtilTest.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiKeySetUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -34,9 +34,9 @@
 import java.security.Key;
 import java.security.NoSuchAlgorithmException;
 
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 
-import org.sakaiproject.basiclti.util.SakaiKeySetUtil;
+import org.sakaiproject.lti.util.SakaiKeySetUtil;
 import org.tsugi.lti13.LTI13Util;
 import org.tsugi.lti13.LTI13KeySetUtil;
 
@@ -163,7 +163,7 @@ public void testRotationAndKeySet()
         assertNotNull(keySetJSON);
         assertTrue(keySetJSON.contains("{\"keys\":[{\"kty\":"));
         assertTrue(keySetJSON.contains(",\"alg\":\"RS256\""));
-        JSONObject ks_json = BasicLTIUtil.parseJSONObject(keySetJSON);
+        JSONObject ks_json = LTIUtil.parseJSONObject(keySetJSON);
         JSONArray keys = (JSONArray) ks_json.get("keys");
         assertEquals(keys.size(), 3);
         for(int i=0; i< keys.size(); i++) {
@@ -186,7 +186,7 @@ public void testRotationAndKeySet()
         assertNotNull(keySetJSON);
         assertTrue(keySetJSON.contains("{\"keys\":[{\"kty\":"));
         assertTrue(keySetJSON.contains(",\"alg\":\"RS256\""));
-        ks_json = BasicLTIUtil.parseJSONObject(keySetJSON);
+        ks_json = LTIUtil.parseJSONObject(keySetJSON);
         keys = (JSONArray) ks_json.get("keys");
         assertEquals(keys.size(), 2);
     }
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiBLTIUtilTest.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiLTIUtilTest.java
similarity index 75%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiBLTIUtilTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiLTIUtilTest.java
index a674b1606d91..1a5b14e04128 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiBLTIUtilTest.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiLTIUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,15 +36,15 @@
 import org.json.simple.JSONObject;
 
 import org.sakaiproject.lti.api.LTIService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.tsugi.basiclti.BasicLTIUtil;
-import org.tsugi.basiclti.BasicLTIConstants;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
+import org.tsugi.lti.LTIUtil;
+import org.tsugi.lti.LTIConstants;
 import org.tsugi.lti13.LTI13ConstantsUtil;
 
 import org.apache.commons.text.StringEscapeUtils;
 
 @Slf4j
-public class SakaiBLTIUtilTest {
+public class SakaiLTIUtilTest {
 
 	public static String [] shouldBeTheSame = {
 		null,
@@ -86,20 +86,20 @@ public void setUp() throws Exception {
 	public void testStrings() {
 		String adj = null;
 		for(String s: shouldBeTheSame) {
-			adj = SakaiBLTIUtil.adjustCustom(s);
+			adj = SakaiLTIUtil.adjustCustom(s);
 			assertEquals(s, adj);
 		}
 
-		adj = SakaiBLTIUtil.adjustCustom("x=1;y=2;z=3");
+		adj = SakaiLTIUtil.adjustCustom("x=1;y=2;z=3");
 		assertEquals(adj,"x=1;y=2;z=3".replace(';','\n'));
-		adj = SakaiBLTIUtil.adjustCustom("x=1;y=2;z=3;");
+		adj = SakaiLTIUtil.adjustCustom("x=1;y=2;z=3;");
 		assertEquals(adj,"x=1;y=2;z=3;".replace(';','\n'));
 	}
 	@Test
 	public void testStringGrade() {
 		String grade="";
 		try {
-			grade = SakaiBLTIUtil.getRoundedGrade(0.57,100.0);
+			grade = SakaiLTIUtil.getRoundedGrade(0.57,100.0);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			log.error(e.getMessage(), e);
@@ -108,7 +108,7 @@ public void testStringGrade() {
 		assertEquals(grade,"57.0");
 
 		try {
-			grade = SakaiBLTIUtil.getRoundedGrade(0.5655,100.0);
+			grade = SakaiLTIUtil.getRoundedGrade(0.5655,100.0);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			log.error(e.getMessage(), e);
@@ -136,15 +136,15 @@ public boolean goodEncrypt(String enc) {
 	public void testEncryptDecrypt() {
 		String plain = "plain";
 		String key = "bob";
-		String encrypt1 = SakaiBLTIUtil.encryptSecret(plain, key);
+		String encrypt1 = SakaiLTIUtil.encryptSecret(plain, key);
 		assertFalse(plain.equals(encrypt1));
 		assertTrue(goodEncrypt(encrypt1));
 		// No double encrypt
-		String encrypt2 = SakaiBLTIUtil.encryptSecret(encrypt1, key);
+		String encrypt2 = SakaiLTIUtil.encryptSecret(encrypt1, key);
 		assertTrue(goodEncrypt(encrypt2));
 		assertEquals(encrypt1, encrypt2);
 		boolean checkonly = false;
-		String decrypt = SakaiBLTIUtil.decryptSecret(encrypt2, key, checkonly);
+		String decrypt = SakaiLTIUtil.decryptSecret(encrypt2, key, checkonly);
 		assertEquals(plain, decrypt);
 	}
 
@@ -154,76 +154,76 @@ public void testLaunchCodes() {
 		content.put(LTIService.LTI_ID, "42");
 		content.put(LTIService.LTI_PLACEMENTSECRET, "xyzzy");
 
-		String launch_code_key = SakaiBLTIUtil.getLaunchCodeKey(content);
+		String launch_code_key = SakaiLTIUtil.getLaunchCodeKey(content);
 		assertEquals(launch_code_key,"launch_code:42");
 
-		String launch_code = SakaiBLTIUtil.getLaunchCode(content);
-		assertTrue(SakaiBLTIUtil.checkLaunchCode(content, launch_code));
+		String launch_code = SakaiLTIUtil.getLaunchCode(content);
+		assertTrue(SakaiLTIUtil.checkLaunchCode(content, launch_code));
 
 		content.put(LTIService.LTI_PLACEMENTSECRET, "wrong");
-		assertFalse(SakaiBLTIUtil.checkLaunchCode(content, launch_code));
+		assertFalse(SakaiLTIUtil.checkLaunchCode(content, launch_code));
 
 		// Correct password different id
 		content.put(LTIService.LTI_ID, "43");
 		content.put(LTIService.LTI_PLACEMENTSECRET, "xyzzy");
-		assertFalse(SakaiBLTIUtil.checkLaunchCode(content, launch_code));
+		assertFalse(SakaiLTIUtil.checkLaunchCode(content, launch_code));
 	}
 
 	@Test
 	public void testConvertLong() {
-		Long l = SakaiBLTIUtil.getLongNull(new Long(2));
+		Long l = SakaiLTIUtil.getLongNull(new Long(2));
 		assertEquals(l, new Long(2));
-		l = SakaiBLTIUtil.getLongNull(new Double(2.2));
+		l = SakaiLTIUtil.getLongNull(new Double(2.2));
 		assertEquals(l, new Long(2));
-		l = SakaiBLTIUtil.getLongNull(null);
+		l = SakaiLTIUtil.getLongNull(null);
 		assertEquals(l, null);
-		l = SakaiBLTIUtil.getLongNull("fred");
+		l = SakaiLTIUtil.getLongNull("fred");
 		assertEquals(l, null);
-		l = SakaiBLTIUtil.getLongNull("null");
+		l = SakaiLTIUtil.getLongNull("null");
 		assertEquals(l, null);
-		l = SakaiBLTIUtil.getLongNull("NULL");
+		l = SakaiLTIUtil.getLongNull("NULL");
 		assertEquals(l, null);
 		// This one is a little weird but it is how it was written - double is different
-		l = SakaiBLTIUtil.getLongNull("");
+		l = SakaiLTIUtil.getLongNull("");
 		assertEquals(l, new Long(-1));
-		l = SakaiBLTIUtil.getLongNull("2");
+		l = SakaiLTIUtil.getLongNull("2");
 		assertEquals(l, new Long(2));
-		l = SakaiBLTIUtil.getLongNull("2.5");
+		l = SakaiLTIUtil.getLongNull("2.5");
 		assertEquals(l, null);
-		l = SakaiBLTIUtil.getLongNull(new Float(3.1));
+		l = SakaiLTIUtil.getLongNull(new Float(3.1));
 		assertEquals(l, new Long(3));
 		// Casting truncates
-		l = SakaiBLTIUtil.getLongNull(new Float(3.9));
+		l = SakaiLTIUtil.getLongNull(new Float(3.9));
 		assertEquals(l, new Long(3));
-		l = SakaiBLTIUtil.getLongNull(new Integer(3));
+		l = SakaiLTIUtil.getLongNull(new Integer(3));
 		assertEquals(l, new Long(3));
 	}
 
 	@Test
 	public void testConvertDouble() {
-		Double d = SakaiBLTIUtil.getDoubleNull(new Double(2.0));
+		Double d = SakaiLTIUtil.getDoubleNull(new Double(2.0));
 		assertEquals(d, new Double(2.0));
-		d = SakaiBLTIUtil.getDoubleNull(new Double(2.5));
+		d = SakaiLTIUtil.getDoubleNull(new Double(2.5));
 		assertEquals(d, new Double(2.5));
-		d = SakaiBLTIUtil.getDoubleNull(null);
+		d = SakaiLTIUtil.getDoubleNull(null);
 		assertEquals(d, null);
-		d = SakaiBLTIUtil.getDoubleNull("fred");
+		d = SakaiLTIUtil.getDoubleNull("fred");
 		assertEquals(d, null);
-		d = SakaiBLTIUtil.getDoubleNull("null");
+		d = SakaiLTIUtil.getDoubleNull("null");
 		assertEquals(d, null);
-		d = SakaiBLTIUtil.getDoubleNull("NULL");
+		d = SakaiLTIUtil.getDoubleNull("NULL");
 		assertEquals(d, null);
-		d = SakaiBLTIUtil.getDoubleNull("");
+		d = SakaiLTIUtil.getDoubleNull("");
 		assertEquals(d, null);
-		d = SakaiBLTIUtil.getDoubleNull("2.0");
+		d = SakaiLTIUtil.getDoubleNull("2.0");
 		assertEquals(d, new Double(2.0));
-		d = SakaiBLTIUtil.getDoubleNull("2.5");
+		d = SakaiLTIUtil.getDoubleNull("2.5");
 		assertEquals(d, new Double(2.5));
-		d = SakaiBLTIUtil.getDoubleNull("2");
+		d = SakaiLTIUtil.getDoubleNull("2");
 		assertEquals(d, new Double(2.0));
-		d = SakaiBLTIUtil.getDoubleNull(new Long(3));
+		d = SakaiLTIUtil.getDoubleNull(new Long(3));
 		assertEquals(d, new Double(3.0));
-		d = SakaiBLTIUtil.getDoubleNull(new Integer(3));
+		d = SakaiLTIUtil.getDoubleNull(new Integer(3));
 		assertEquals(d, new Double(3.0));
 	}
 
@@ -254,13 +254,13 @@ public void testFindBestTool() {
 			tool.put(LTIService.LTI_SITE_ID, ""); // Global
 			tools.add(tool);
 
-			bestTool = SakaiBLTIUtil.findBestToolMatch(s, tools);
+			bestTool = SakaiLTIUtil.findBestToolMatch(s, tools);
 			bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 			bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 			assertEquals(s, bestLaunch);
 			assertEquals("", bestSite);
 
-			bestTool = SakaiBLTIUtil.findBestToolMatch(mostSpecific, tools);
+			bestTool = SakaiLTIUtil.findBestToolMatch(mostSpecific, tools);
 			bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 			bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 			assertEquals(s, bestLaunch);
@@ -275,13 +275,13 @@ public void testFindBestTool() {
 			tool.put(LTIService.LTI_SITE_ID, ""); // Global
 			tools.add(tool);
 
-			bestTool = SakaiBLTIUtil.findBestToolMatch(s, tools);
+			bestTool = SakaiLTIUtil.findBestToolMatch(s, tools);
 			bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 			bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 			assertEquals(s, bestLaunch);
 			assertEquals("", bestSite);
 
-			bestTool = SakaiBLTIUtil.findBestToolMatch(mostSpecific, tools);
+			bestTool = SakaiLTIUtil.findBestToolMatch(mostSpecific, tools);
 			bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 			bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 			assertEquals(s, bestLaunch);
@@ -293,7 +293,7 @@ public void testFindBestTool() {
 		tool.put(LTIService.LTI_SITE_ID, siteId);
 		tools.add(tool);
 
-		bestTool = SakaiBLTIUtil.findBestToolMatch(mostSpecific, tools);
+		bestTool = SakaiLTIUtil.findBestToolMatch(mostSpecific, tools);
 		bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 		bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 		assertEquals(leastSpecific, bestLaunch);
@@ -309,13 +309,13 @@ public void testFindBestTool() {
 			tool.put(LTIService.LTI_SITE_ID, siteId); // Local
 			tools.add(tool);
 
-			bestTool = SakaiBLTIUtil.findBestToolMatch(s, tools);
+			bestTool = SakaiLTIUtil.findBestToolMatch(s, tools);
 			bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 			bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 			assertEquals(s, bestLaunch);
 			assertEquals(siteId, bestSite);
 
-			bestTool = SakaiBLTIUtil.findBestToolMatch(mostSpecific, tools);
+			bestTool = SakaiLTIUtil.findBestToolMatch(mostSpecific, tools);
 			bestLaunch = (String) bestTool.get(LTIService.LTI_LAUNCH);
 			bestSite = (String) bestTool.get(LTIService.LTI_SITE_ID);
 			assertEquals(s, bestLaunch);
@@ -358,44 +358,44 @@ public void testStripOffQuery() {
 		};
 
 		for(String s: testUrls) {
-			assertEquals(SakaiBLTIUtil.stripOffQuery(s), crudeButEffectiveStripOffQuery(s));
+			assertEquals(SakaiLTIUtil.stripOffQuery(s), crudeButEffectiveStripOffQuery(s));
 		}
 	}
 
 	@Test
 	public void testTrackResourceLinkID() {
 		Map<String, Object> oldContent = new TreeMap<String, Object> ();
-		JSONObject old_json = BasicLTIUtil.parseJSONObject("");
+		JSONObject old_json = LTIUtil.parseJSONObject("");
 		old_json.put(LTIService.LTI_ID_HISTORY,"content:1,content:2");
 		oldContent.put(LTIService.LTI_SETTINGS, old_json.toString());
 		oldContent.put(LTIService.LTI_ID, "4");
 
-		String post = SakaiBLTIUtil.trackResourceLinkID(oldContent);
+		String post = SakaiLTIUtil.trackResourceLinkID(oldContent);
 		assertEquals(post, "content:1,content:2,content:4");
 
 		Map<String, Object> newContent = new TreeMap<String, Object> ();
-		JSONObject new_json = BasicLTIUtil.parseJSONObject("");
+		JSONObject new_json = LTIUtil.parseJSONObject("");
 		new_json.put(LTIService.LTI_ID_HISTORY,"content:2,content:3");
 		newContent.put(LTIService.LTI_SETTINGS, new_json.toString());
 
-		boolean retval = SakaiBLTIUtil.trackResourceLinkID(newContent, oldContent);
+		boolean retval = SakaiLTIUtil.trackResourceLinkID(newContent, oldContent);
 		assertTrue(retval);
 
 		post = (String) newContent.get(LTIService.LTI_SETTINGS);
-		JSONObject post_json = BasicLTIUtil.parseJSONObject(post);
+		JSONObject post_json = LTIUtil.parseJSONObject(post);
 		String post_history = (String) post_json.get(LTIService.LTI_ID_HISTORY);
 		assertEquals(post_history, "content:1,content:2,content:3,content:4");
 
 		// Verify no double add
-		retval = SakaiBLTIUtil.trackResourceLinkID(newContent, oldContent);
+		retval = SakaiLTIUtil.trackResourceLinkID(newContent, oldContent);
 		assertFalse(retval);
 
 		// Have an empty settings in the newContent item (typical use case);
 		newContent.remove(LTIService.LTI_SETTINGS);
-		retval = SakaiBLTIUtil.trackResourceLinkID(newContent, oldContent);
+		retval = SakaiLTIUtil.trackResourceLinkID(newContent, oldContent);
 
 		post = (String) newContent.get(LTIService.LTI_SETTINGS);
-		post_json = BasicLTIUtil.parseJSONObject(post);
+		post_json = LTIUtil.parseJSONObject(post);
 		post_history = (String) post_json.get(LTIService.LTI_ID_HISTORY);
 		assertEquals(post_history, "content:1,content:2,content:4");
 	}
@@ -404,63 +404,63 @@ public void testTrackResourceLinkID() {
 	@Test
 	public void testConvertRoleMapPropToMap() {
 		String roleMap = "sakairole1:ltirole1,sakairole2:ltirole2";
-		Map retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
+		Map retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 2);
 
         // * Using semicolon as the delimiter allows you to indicate more than one IMS role.
 		roleMap = "sakairole4:ltirole4,ltirole5;sakairole6:ltirole6";
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 2);
 
-		roleMap = "maintain:"+BasicLTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";sakairole6:ltirole6";
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
+		roleMap = "maintain:"+LTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";sakairole6:ltirole6";
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 2);
 
 		// Semicolon at end
-		roleMap = "maintain:"+BasicLTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";sakairole6:ltirole6;";
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
+		roleMap = "maintain:"+LTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";sakairole6:ltirole6;";
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 2);
 
 		// Semicolon at beginning
-		roleMap = ";maintain:"+BasicLTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";sakairole6:ltirole6";
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
+		roleMap = ";maintain:"+LTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";sakairole6:ltirole6";
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 2);
 
 		// Many semicolon in the middle
-		roleMap = "maintain:"+BasicLTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
-                "," + BasicLTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";;;;sakairole6:ltirole6";
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
+		roleMap = "maintain:"+LTIConstants.MEMBERSHIP_ROLE_CONTEXT_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_SYSTEM_ADMIN +
+                "," + LTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+ ";;;;sakairole6:ltirole6";
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(roleMap);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 2);
 
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(null);
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(null);
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 0);
 
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap("");
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap("");
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 0);
 
-		retval = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(" ");
+		retval = SakaiLTIUtil.convertOutboundRoleMapPropToMap(" ");
 		assertTrue(retval instanceof Map);
 		assertTrue(retval.size() == 0);
 	}
 
 	@Test
 	public void testDefaultRoleMap() {
-		Map<String, String> roleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(SakaiBLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT);
+		Map<String, String> roleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(SakaiLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT);
 
 		assertTrue(roleMap instanceof Map);
 		assertEquals(9, roleMap.size());
@@ -476,12 +476,12 @@ public void testDefaultRoleMap() {
 
 	@Test
 	public void testInboundRoleMap() {
-		Map<String, String> legacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT);
+		Map<String, String> legacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(SakaiLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT);
 		assertTrue(legacyMap instanceof Map);
 		assertEquals(legacyMap.size(), 10);
 		assertTrue(legacyMap.get("Yada") == null);
 
-		Map<String, List<String>> roleMap = SakaiBLTIUtil.convertInboundRoleMapPropToMap(SakaiBLTIUtil.LTI_INBOUND_ROLE_MAP_DEFAULT);
+		Map<String, List<String>> roleMap = SakaiLTIUtil.convertInboundRoleMapPropToMap(SakaiLTIUtil.LTI_INBOUND_ROLE_MAP_DEFAULT);
 		assertTrue(roleMap instanceof Map);
 		assertEquals(roleMap.size(), 9);
 		assertTrue(roleMap.get("Yada") == null);
@@ -516,26 +516,26 @@ public void testInboundRoleMap() {
 	// Local so as not to call ServerConfigurationService
 	public static String mapOutboundRole(String sakaiRole, String toolOutboundMapStr)
 	{
-		Map<String, String> propLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(
+		Map<String, String> propLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(
 			"urn:lti:instrole:dude=http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor#Dude"
 		);
-		Map<String, String> defaultLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT);
+		Map<String, String> defaultLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(SakaiLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT);
 
-		Map<String, String> toolRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(toolOutboundMapStr);
+		Map<String, String> toolRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(toolOutboundMapStr);
 
-		Map<String, String> propRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(
+		Map<String, String> propRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(
 			"Dude:Dude,http://purl.imsglobal.org/vocab/lis/v2/institution/person#Abides;" +
 			"Staff:Staff,Dude,http://purl.imsglobal.org/vocab/lis/v2/institution/person#Staff;"
 		);
-		Map<String, String> defaultRoleMap = SakaiBLTIUtil.convertOutboundRoleMapPropToMap(SakaiBLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT);
+		Map<String, String> defaultRoleMap = SakaiLTIUtil.convertOutboundRoleMapPropToMap(SakaiLTIUtil.LTI_OUTBOUND_ROLE_MAP_DEFAULT);
 
-		return SakaiBLTIUtil.mapOutboundRole(sakaiRole, toolRoleMap, propRoleMap, defaultRoleMap, propLegacyMap, defaultLegacyMap);
+		return SakaiLTIUtil.mapOutboundRole(sakaiRole, toolRoleMap, propRoleMap, defaultRoleMap, propLegacyMap, defaultLegacyMap);
 	}
 
 	// https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 	@Test
 	public void testOutbound() {
-		String toolProp = "ToolI:Instructor;ToolM:Instructor,Learner;ToolA:"+BasicLTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+";";
+		String toolProp = "ToolI:Instructor;ToolM:Instructor,Learner;ToolA:"+LTIConstants.MEMBERSHIP_ROLE_INSTITUTION_ADMIN+";";
 
 		String imsRole = mapOutboundRole("maintain", toolProp);
 		assertEquals("Instructor,http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor", imsRole);
@@ -577,16 +577,16 @@ public void testOutbound() {
 	public static String mapInboundRole(String incomingRoles, Set<String> siteRoles, String tenantInboundMapStr)
 	{
 		// Helps upgrade legacy roles like Instructor or urn:lti:sysrole:ims/lis/Administrator
-		Map<String, String> propLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(
+		Map<String, String> propLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(
 			"urn:lti:instrole:dude=http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor#Dude"
 		);
-		Map<String, String> defaultLegacyMap = SakaiBLTIUtil.convertLegacyRoleMapPropToMap(SakaiBLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT);
+		Map<String, String> defaultLegacyMap = SakaiLTIUtil.convertLegacyRoleMapPropToMap(SakaiLTIUtil.LTI_LEGACY_ROLE_MAP_DEFAULT);
 
-		Map<String, List<String>> tenantInboundMap = SakaiBLTIUtil.convertInboundRoleMapPropToMap(tenantInboundMapStr);
-		Map<String, List<String>> propInboundMap = null; // SakaiBLTIUtil.convertInboundRoleMapPropToMap( ServerConfigurationService.getString(SakaiBLTIUtil.LTI_INBOUND_ROLE_MAP));
-		Map<String, List<String>> defaultInboundMap = SakaiBLTIUtil.convertInboundRoleMapPropToMap(SakaiBLTIUtil.LTI_INBOUND_ROLE_MAP_DEFAULT);
+		Map<String, List<String>> tenantInboundMap = SakaiLTIUtil.convertInboundRoleMapPropToMap(tenantInboundMapStr);
+		Map<String, List<String>> propInboundMap = null; // SakaiLTIUtil.convertInboundRoleMapPropToMap( ServerConfigurationService.getString(SakaiLTIUtil.LTI_INBOUND_ROLE_MAP));
+		Map<String, List<String>> defaultInboundMap = SakaiLTIUtil.convertInboundRoleMapPropToMap(SakaiLTIUtil.LTI_INBOUND_ROLE_MAP_DEFAULT);
 
-		return SakaiBLTIUtil.mapInboundRole(incomingRoles, siteRoles, tenantInboundMap, propInboundMap, defaultInboundMap, propLegacyMap, defaultLegacyMap);
+		return SakaiLTIUtil.mapInboundRole(incomingRoles, siteRoles, tenantInboundMap, propInboundMap, defaultInboundMap, propLegacyMap, defaultLegacyMap);
 	}
 
 	@Test
@@ -720,12 +720,12 @@ public String compileJavaScript(String extraJS) {
 	public void testFormPost() {
 		boolean autosubmit = true;
 		String submit_form_id = "42";
-		String extraJS = SakaiBLTIUtil.getLaunchJavaScript(submit_form_id, autosubmit);
+		String extraJS = SakaiLTIUtil.getLaunchJavaScript(submit_form_id, autosubmit);
 		assertTrue(extraJS.contains("document.getElementById"));
 		assertEquals(compileJavaScript(extraJS), "success");
 
 		autosubmit = false;
-		extraJS = SakaiBLTIUtil.getLaunchJavaScript(submit_form_id, autosubmit);
+		extraJS = SakaiLTIUtil.getLaunchJavaScript(submit_form_id, autosubmit);
 		assertFalse(extraJS.contains("document.getElementById"));
 		assertEquals(compileJavaScript(extraJS), "success");
 
@@ -736,12 +736,12 @@ public void testFormPost() {
 		String launch_error = "Dude abides";
 
 		boolean dodebug = false;
-		String form = SakaiBLTIUtil.getJwsHTMLForm(launch_url, "id_token", jws, ljs, state, launch_error, dodebug);
+		String form = SakaiLTIUtil.getJwsHTMLForm(launch_url, "id_token", jws, ljs, state, launch_error, dodebug);
 		assertEquals(compileJavaScript(form), "success");
 		assertTrue(form.contains("document.getElementById"));
 
 		dodebug = true;
-		form = SakaiBLTIUtil.getJwsHTMLForm(launch_url, "id_token", jws, ljs, state, launch_error, dodebug);
+		form = SakaiLTIUtil.getJwsHTMLForm(launch_url, "id_token", jws, ljs, state, launch_error, dodebug);
 		assertEquals(compileJavaScript(form), "success");
 		assertFalse(form.contains("document.getElementById"));
 	}
@@ -752,40 +752,40 @@ public void testGetNewpage() {
 		Map<String, Object> content = new HashMap();
 
 		// Run default tests
-		boolean retval = SakaiBLTIUtil.getNewpage(null, null, true);
+		boolean retval = SakaiLTIUtil.getNewpage(null, null, true);
 		assertEquals(retval, true);
-		retval = SakaiBLTIUtil.getNewpage(null, null, false);
+		retval = SakaiLTIUtil.getNewpage(null, null, false);
 		assertEquals(retval, false);
 
 		// No data means default comes through
-		retval = SakaiBLTIUtil.getNewpage(tool, content, true);
+		retval = SakaiLTIUtil.getNewpage(tool, content, true);
 		assertEquals(retval, true);
-		retval = SakaiBLTIUtil.getNewpage(tool, content, false);
+		retval = SakaiLTIUtil.getNewpage(tool, content, false);
 		assertEquals(retval, false);
 
 		// Only content
 		content.put(LTIService.LTI_NEWPAGE, new Integer(0));
-		retval = SakaiBLTIUtil.getNewpage(tool, content, true);
+		retval = SakaiLTIUtil.getNewpage(tool, content, true);
 		assertEquals(retval, false);
 		content.put(LTIService.LTI_NEWPAGE, new Integer(1));
-		retval = SakaiBLTIUtil.getNewpage(tool, content, false);
+		retval = SakaiLTIUtil.getNewpage(tool, content, false);
 		assertEquals(retval, true);
 
 		// Tool wins
 		tool.put(LTIService.LTI_NEWPAGE, new Integer(LTIService.LTI_TOOL_NEWPAGE_OFF));
-		retval = SakaiBLTIUtil.getNewpage(tool, content, false);
+		retval = SakaiLTIUtil.getNewpage(tool, content, false);
 		assertEquals(retval, false);
 
 		tool.put(LTIService.LTI_NEWPAGE, new Integer(LTIService.LTI_TOOL_NEWPAGE_ON));
-		retval = SakaiBLTIUtil.getNewpage(tool, content, false);
+		retval = SakaiLTIUtil.getNewpage(tool, content, false);
 		assertEquals(retval, true);
 
 		// Let content win
 		tool.put(LTIService.LTI_NEWPAGE, new Integer(LTIService.LTI_TOOL_NEWPAGE_CONTENT));
-		retval = SakaiBLTIUtil.getNewpage(tool, content, false);
+		retval = SakaiLTIUtil.getNewpage(tool, content, false);
 		assertEquals(retval, true);
 		content.put(LTIService.LTI_NEWPAGE, new Integer(0));
-		retval = SakaiBLTIUtil.getNewpage(tool, content, true);
+		retval = SakaiLTIUtil.getNewpage(tool, content, true);
 		assertEquals(retval, false);
 	}
 
@@ -793,33 +793,33 @@ public void testGetNewpage() {
 	public void testGetFrameHeight() {
 		Map<String, Object> tool = new HashMap();
 		Map<String, Object> content = new HashMap();
-		String retval = SakaiBLTIUtil.getFrameHeight(null, null, "1200px");
+		String retval = SakaiLTIUtil.getFrameHeight(null, null, "1200px");
 		assertEquals(retval, "1200px");
 
 		// Both are empty
-		retval = SakaiBLTIUtil.getFrameHeight(tool, content, "1200px");
+		retval = SakaiLTIUtil.getFrameHeight(tool, content, "1200px");
 		assertEquals(retval, "1200px");
 
 		content.put(LTIService.LTI_FRAMEHEIGHT, new Integer(42));
-		retval = SakaiBLTIUtil.getFrameHeight(tool, content, "1200px");
+		retval = SakaiLTIUtil.getFrameHeight(tool, content, "1200px");
 		assertEquals(retval, "42px");
 
 		// Tool is empty
 		content.put(LTIService.LTI_FRAMEHEIGHT, new Integer(42));
-		retval = SakaiBLTIUtil.getFrameHeight(tool, content, "1200px");
+		retval = SakaiLTIUtil.getFrameHeight(tool, content, "1200px");
 		assertEquals(retval, "42px");
 
 		// Strings work as well - just in case
 		content.put(LTIService.LTI_FRAMEHEIGHT, "44");
-		retval = SakaiBLTIUtil.getFrameHeight(tool, content, "1200px");
+		retval = SakaiLTIUtil.getFrameHeight(tool, content, "1200px");
 		assertEquals(retval, "44px");
 
 		tool.put(LTIService.LTI_FRAMEHEIGHT, new Integer(100));
-		retval = SakaiBLTIUtil.getFrameHeight(tool, content, "1200px");
+		retval = SakaiLTIUtil.getFrameHeight(tool, content, "1200px");
 		assertEquals(retval, "44px");
 
 		// Content takes precedence 
-		retval = SakaiBLTIUtil.getFrameHeight(tool, content, "1200px");
+		retval = SakaiLTIUtil.getFrameHeight(tool, content, "1200px");
 		assertEquals(retval, "44px");
 	}
 
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SimpleEncryptionTest.java b/lti/lti-common/src/test/org/sakaiproject/lti/util/SimpleEncryptionTest.java
similarity index 99%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SimpleEncryptionTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti/util/SimpleEncryptionTest.java
index 7a7d28eb6723..c07384d3a17a 100644
--- a/basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SimpleEncryptionTest.java
+++ b/lti/lti-common/src/test/org/sakaiproject/lti/util/SimpleEncryptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.util;
+package org.sakaiproject.lti.util;
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/lti13/LineItemUtilTest.java b/lti/lti-common/src/test/org/sakaiproject/lti13/LineItemUtilTest.java
similarity index 100%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/lti13/LineItemUtilTest.java
rename to lti/lti-common/src/test/org/sakaiproject/lti13/LineItemUtilTest.java
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java b/lti/lti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java
similarity index 100%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java
rename to lti/lti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java
diff --git a/basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java b/lti/lti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java
similarity index 100%
rename from basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java
rename to lti/lti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java
diff --git a/basiclti/basiclti-impl/.gitignore b/lti/lti-impl/.gitignore
similarity index 100%
rename from basiclti/basiclti-impl/.gitignore
rename to lti/lti-impl/.gitignore
diff --git a/basiclti/basiclti-impl/pom.xml b/lti/lti-impl/pom.xml
similarity index 91%
rename from basiclti/basiclti-impl/pom.xml
rename to lti/lti-impl/pom.xml
index da5a73639fa8..0c204fba7416 100644
--- a/basiclti/basiclti-impl/pom.xml
+++ b/lti/lti-impl/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
-    <name>Sakai LTI Implementation (basiclti-impl)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti-impl</artifactId>
+    <name>Sakai LTI Implementation (lti-impl)</name>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti-impl</artifactId>
     <packaging>sakai-component</packaging>
 
     <properties>
@@ -20,15 +20,15 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc.properties b/lti/lti-impl/src/bundle/basicltisvc.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc.properties
rename to lti/lti-impl/src/bundle/basicltisvc.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_ar.properties b/lti/lti-impl/src/bundle/basicltisvc_ar.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_ar.properties
rename to lti/lti-impl/src/bundle/basicltisvc_ar.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_bg.properties b/lti/lti-impl/src/bundle/basicltisvc_bg.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_bg.properties
rename to lti/lti-impl/src/bundle/basicltisvc_bg.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_ca.properties b/lti/lti-impl/src/bundle/basicltisvc_ca.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_ca.properties
rename to lti/lti-impl/src/bundle/basicltisvc_ca.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_de_DE.properties b/lti/lti-impl/src/bundle/basicltisvc_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_de_DE.properties
rename to lti/lti-impl/src/bundle/basicltisvc_de_DE.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_es.properties b/lti/lti-impl/src/bundle/basicltisvc_es.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_es.properties
rename to lti/lti-impl/src/bundle/basicltisvc_es.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_eu.properties b/lti/lti-impl/src/bundle/basicltisvc_eu.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_eu.properties
rename to lti/lti-impl/src/bundle/basicltisvc_eu.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_fa_IR.properties b/lti/lti-impl/src/bundle/basicltisvc_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_fa_IR.properties
rename to lti/lti-impl/src/bundle/basicltisvc_fa_IR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_fr_FR.properties b/lti/lti-impl/src/bundle/basicltisvc_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_fr_FR.properties
rename to lti/lti-impl/src/bundle/basicltisvc_fr_FR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_hi_IN.properties b/lti/lti-impl/src/bundle/basicltisvc_hi_IN.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_hi_IN.properties
rename to lti/lti-impl/src/bundle/basicltisvc_hi_IN.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_ja.properties b/lti/lti-impl/src/bundle/basicltisvc_ja.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_ja.properties
rename to lti/lti-impl/src/bundle/basicltisvc_ja.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_mn.properties b/lti/lti-impl/src/bundle/basicltisvc_mn.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_mn.properties
rename to lti/lti-impl/src/bundle/basicltisvc_mn.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_pt_BR.properties b/lti/lti-impl/src/bundle/basicltisvc_pt_BR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_pt_BR.properties
rename to lti/lti-impl/src/bundle/basicltisvc_pt_BR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_ro_RO.properties b/lti/lti-impl/src/bundle/basicltisvc_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_ro_RO.properties
rename to lti/lti-impl/src/bundle/basicltisvc_ro_RO.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_sr.properties b/lti/lti-impl/src/bundle/basicltisvc_sr.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_sr.properties
rename to lti/lti-impl/src/bundle/basicltisvc_sr.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_tr_TR.properties b/lti/lti-impl/src/bundle/basicltisvc_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_tr_TR.properties
rename to lti/lti-impl/src/bundle/basicltisvc_tr_TR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/basicltisvc_zh_CN.properties b/lti/lti-impl/src/bundle/basicltisvc_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/basicltisvc_zh_CN.properties
rename to lti/lti-impl/src/bundle/basicltisvc_zh_CN.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email.properties b/lti/lti-impl/src/bundle/email.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email.properties
rename to lti/lti-impl/src/bundle/email.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_ar.properties b/lti/lti-impl/src/bundle/email_ar.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_ar.properties
rename to lti/lti-impl/src/bundle/email_ar.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_bg.properties b/lti/lti-impl/src/bundle/email_bg.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_bg.properties
rename to lti/lti-impl/src/bundle/email_bg.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_ca.properties b/lti/lti-impl/src/bundle/email_ca.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_ca.properties
rename to lti/lti-impl/src/bundle/email_ca.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_de_DE.properties b/lti/lti-impl/src/bundle/email_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_de_DE.properties
rename to lti/lti-impl/src/bundle/email_de_DE.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_es.properties b/lti/lti-impl/src/bundle/email_es.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_es.properties
rename to lti/lti-impl/src/bundle/email_es.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_eu.properties b/lti/lti-impl/src/bundle/email_eu.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_eu.properties
rename to lti/lti-impl/src/bundle/email_eu.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_fr_FR.properties b/lti/lti-impl/src/bundle/email_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_fr_FR.properties
rename to lti/lti-impl/src/bundle/email_fr_FR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_ja.properties b/lti/lti-impl/src/bundle/email_ja.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_ja.properties
rename to lti/lti-impl/src/bundle/email_ja.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_ro_RO.properties b/lti/lti-impl/src/bundle/email_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_ro_RO.properties
rename to lti/lti-impl/src/bundle/email_ro_RO.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_sr.properties b/lti/lti-impl/src/bundle/email_sr.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_sr.properties
rename to lti/lti-impl/src/bundle/email_sr.properties
diff --git a/basiclti/basiclti-impl/src/bundle/email_tr_TR.properties b/lti/lti-impl/src/bundle/email_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/email_tr_TR.properties
rename to lti/lti-impl/src/bundle/email_tr_TR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice.properties b/lti/lti-impl/src/bundle/ltiservice.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice.properties
rename to lti/lti-impl/src/bundle/ltiservice.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_ar.properties b/lti/lti-impl/src/bundle/ltiservice_ar.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_ar.properties
rename to lti/lti-impl/src/bundle/ltiservice_ar.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_bg.properties b/lti/lti-impl/src/bundle/ltiservice_bg.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_bg.properties
rename to lti/lti-impl/src/bundle/ltiservice_bg.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_ca.properties b/lti/lti-impl/src/bundle/ltiservice_ca.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_ca.properties
rename to lti/lti-impl/src/bundle/ltiservice_ca.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_de_DE.properties b/lti/lti-impl/src/bundle/ltiservice_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_de_DE.properties
rename to lti/lti-impl/src/bundle/ltiservice_de_DE.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_es.properties b/lti/lti-impl/src/bundle/ltiservice_es.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_es.properties
rename to lti/lti-impl/src/bundle/ltiservice_es.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_eu.properties b/lti/lti-impl/src/bundle/ltiservice_eu.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_eu.properties
rename to lti/lti-impl/src/bundle/ltiservice_eu.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_fa_IR.properties b/lti/lti-impl/src/bundle/ltiservice_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_fa_IR.properties
rename to lti/lti-impl/src/bundle/ltiservice_fa_IR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_fr_FR.properties b/lti/lti-impl/src/bundle/ltiservice_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_fr_FR.properties
rename to lti/lti-impl/src/bundle/ltiservice_fr_FR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_hi_IN.properties b/lti/lti-impl/src/bundle/ltiservice_hi_IN.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_hi_IN.properties
rename to lti/lti-impl/src/bundle/ltiservice_hi_IN.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_ja.properties b/lti/lti-impl/src/bundle/ltiservice_ja.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_ja.properties
rename to lti/lti-impl/src/bundle/ltiservice_ja.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_mn.properties b/lti/lti-impl/src/bundle/ltiservice_mn.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_mn.properties
rename to lti/lti-impl/src/bundle/ltiservice_mn.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_pt_BR.properties b/lti/lti-impl/src/bundle/ltiservice_pt_BR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_pt_BR.properties
rename to lti/lti-impl/src/bundle/ltiservice_pt_BR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_ro_RO.properties b/lti/lti-impl/src/bundle/ltiservice_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_ro_RO.properties
rename to lti/lti-impl/src/bundle/ltiservice_ro_RO.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_sr.properties b/lti/lti-impl/src/bundle/ltiservice_sr.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_sr.properties
rename to lti/lti-impl/src/bundle/ltiservice_sr.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_tr_TR.properties b/lti/lti-impl/src/bundle/ltiservice_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_tr_TR.properties
rename to lti/lti-impl/src/bundle/ltiservice_tr_TR.properties
diff --git a/basiclti/basiclti-impl/src/bundle/ltiservice_zh_CN.properties b/lti/lti-impl/src/bundle/ltiservice_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-impl/src/bundle/ltiservice_zh_CN.properties
rename to lti/lti-impl/src/bundle/ltiservice_zh_CN.properties
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/UserPictureSetterImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/UserPictureSetterImpl.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/UserPictureSetterImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/UserPictureSetterImpl.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/DBLTIService.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/DBLTIService.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/DBLTIService.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/DBLTIService.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/ExporterCSV.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/ExporterCSV.java
similarity index 92%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/ExporterCSV.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/ExporterCSV.java
index b13b18276dbd..4e0715170605 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/ExporterCSV.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/ExporterCSV.java
@@ -42,7 +42,7 @@ public ExporterCSV() {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.sakaiproject.basiclti.util.LTIExporter#newLine()
+	 * @see org.sakaiproject.lti.util.LTIExporter#newLine()
 	 */
 	@Override
 	public void newLine() {
@@ -52,7 +52,7 @@ public void newLine() {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.sakaiproject.basiclti.util.LTIExporter#addCell(java.lang.String)
+	 * @see org.sakaiproject.lti.util.LTIExporter#addCell(java.lang.String)
 	 */
 	@Override
 	public void addCell(String text) {
@@ -64,7 +64,7 @@ public void addCell(String text) {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.sakaiproject.basiclti.util.LTIExporter#write()
+	 * @see org.sakaiproject.lti.util.LTIExporter#write()
 	 */
 	@Override
 	public void write(OutputStream out) {
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/ExporterExcel.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/ExporterExcel.java
similarity index 91%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/ExporterExcel.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/ExporterExcel.java
index fff586ad3407..3804b0a36408 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/ExporterExcel.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/ExporterExcel.java
@@ -49,7 +49,7 @@ public ExporterExcel() {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.sakaiproject.basiclti.util.LTIExporter#newLine()
+	 * @see org.sakaiproject.lti.util.LTIExporter#newLine()
 	 */
 	@Override
 	public void newLine() {
@@ -58,7 +58,7 @@ public void newLine() {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.sakaiproject.basiclti.util.LTIExporter#addCell(java.lang.String)
+	 * @see org.sakaiproject.lti.util.LTIExporter#addCell(java.lang.String)
 	 */
 	@Override
 	public void addCell(String text) {
@@ -67,7 +67,7 @@ public void addCell(String text) {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.sakaiproject.basiclti.util.LTIExporter#write()
+	 * @see org.sakaiproject.lti.util.LTIExporter#write()
 	 */
 	@Override
 	public void write(OutputStream out) {
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/FoormMapRowMapper.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/FoormMapRowMapper.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/FoormMapRowMapper.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/FoormMapRowMapper.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTIArchiveBean.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIArchiveBean.java
similarity index 85%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTIArchiveBean.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIArchiveBean.java
index da4d338b84a0..7edb91817d4c 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTIArchiveBean.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIArchiveBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.impl;
+package org.sakaiproject.lti.impl;
 
 import java.util.Properties;
 
@@ -24,7 +24,7 @@
 import org.w3c.dom.Node;
 
 @Slf4j
-public class BasicLTIArchiveBean {
+public class LTIArchiveBean {
         private String pageTitle = null;
         private String toolTitle = null;
         private Properties siteToolProperties = new Properties();
@@ -34,13 +34,13 @@ public class BasicLTIArchiveBean {
         public final static String TOOL_TITLE = "toolTitle";
         public final static String SITE_TOOL_PROPERTIES = "siteToolProperties";
 
-        public BasicLTIArchiveBean()
+        public LTIArchiveBean()
         {
         }
         
-        public BasicLTIArchiveBean(Node basicLTI) throws Exception
+        public LTIArchiveBean(Node basicLTI) throws Exception
         {
-        	// Parse basicLTI Element Node and populate fields in BasicLTI bean
+        	// Parse basicLTI Element Node and populate fields in LTI bean
         	// The only fields should be pageTitle, toolTitle and siteToolProperties
         	if(basicLTI.getChildNodes().getLength() != 3)
         	{
@@ -50,7 +50,7 @@ public BasicLTIArchiveBean(Node basicLTI) throws Exception
         	{
         		// This node is a child of node basicLTI
         		Node basicLTIChildNode = basicLTI.getChildNodes().item(i);
-            	if(basicLTIChildNode.getNodeName().equals(BasicLTIArchiveBean.PAGE_TITLE))
+            	if(basicLTIChildNode.getNodeName().equals(LTIArchiveBean.PAGE_TITLE))
         		{
         			if(this.pageTitle != null)
         			{
@@ -58,7 +58,7 @@ public BasicLTIArchiveBean(Node basicLTI) throws Exception
         			}
         			this.pageTitle = basicLTIChildNode.getTextContent();
         		}
-            	else if(basicLTIChildNode.getNodeName().equals(BasicLTIArchiveBean.TOOL_TITLE))
+            	else if(basicLTIChildNode.getNodeName().equals(LTIArchiveBean.TOOL_TITLE))
         		{
         			if(this.toolTitle != null)
         			{
@@ -66,7 +66,7 @@ else if(basicLTIChildNode.getNodeName().equals(BasicLTIArchiveBean.TOOL_TITLE))
         			}
         			this.toolTitle = basicLTIChildNode.getTextContent();
         		}
-        		else if(basicLTIChildNode.getNodeName().equals(BasicLTIArchiveBean.SITE_TOOL_PROPERTIES))
+        		else if(basicLTIChildNode.getNodeName().equals(LTIArchiveBean.SITE_TOOL_PROPERTIES))
         		{
         			// if siteToolProperties has already been populated
         			if(this.getSiteToolProperties().keySet().size() != 0)
@@ -128,17 +128,17 @@ public Node toNode(Document doc)
     		log.debug("Building node for {}", this.getPageTitle());
 			// The alias is the name of the root element -- basicLTI
 			// Look at the XStream documentation to see why I chose the term "alias"
-			node = doc.createElement(BasicLTIArchiveBean.ALIAS);
+			node = doc.createElement(LTIArchiveBean.ALIAS);
 			
-			Node pageTitleNode = doc.createElement(BasicLTIArchiveBean.PAGE_TITLE);
+			Node pageTitleNode = doc.createElement(LTIArchiveBean.PAGE_TITLE);
 			pageTitleNode.setTextContent(this.getPageTitle());
 			node.appendChild(pageTitleNode);
 			
-			Node toolTitleNode = doc.createElement(BasicLTIArchiveBean.TOOL_TITLE);
+			Node toolTitleNode = doc.createElement(LTIArchiveBean.TOOL_TITLE);
 			toolTitleNode.setTextContent(this.getToolTitle());
 			node.appendChild(toolTitleNode);
 			
-			Node propertiesNode = doc.createElement(BasicLTIArchiveBean.SITE_TOOL_PROPERTIES);
+			Node propertiesNode = doc.createElement(LTIArchiveBean.SITE_TOOL_PROPERTIES);
 			for(Object key: this.getSiteToolProperties().keySet())
 			{
 				Attr name = doc.createAttribute("name");
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/LTIContentArchiveBean.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIContentArchiveBean.java
similarity index 98%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/LTIContentArchiveBean.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIContentArchiveBean.java
index 2d5d86fdbe64..0f1121008f80 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/LTIContentArchiveBean.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIContentArchiveBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.basiclti.impl;
+package org.sakaiproject.lti.impl;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIExportServiceImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIExportServiceImpl.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIExportServiceImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIExportServiceImpl.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
similarity index 88%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
index fead3492a02a..781e67ee4acb 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
@@ -24,9 +24,9 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;
@@ -55,8 +55,8 @@ public class LTIRoleMapperImpl implements LTIRoleMapper {
 	public Map.Entry<String, String> mapLTIRole(Map payload, User user, Site site, boolean trustedConsumer, String inboundMapStr) throws LTIException {
 
 		// Remember payload is ether an LTI 1.1 launch or simulated data from an LTI 1.1 launch
-		String ltiRole = (String) payload.get(BasicLTIConstants.ROLES);
-		if ( StringUtils.isBlank(ltiRole) ) ltiRole = BasicLTIConstants.MEMBERSHIP_ROLE_LEARNER;
+		String ltiRole = (String) payload.get(LTIConstants.ROLES);
+		if ( StringUtils.isBlank(ltiRole) ) ltiRole = LTIConstants.MEMBERSHIP_ROLE_LEARNER;
 
 		String extSakaiRole = (String) payload.get("ext_sakai_role");
 
@@ -87,15 +87,15 @@ public Map.Entry<String, String> mapLTIRole(Map payload, User user, Site site, b
 		}
 
 		// Check if inbound mapping will find a role
-		String sakaiRole = SakaiBLTIUtil.mapInboundRole(ltiRole, siteRoles, inboundMapStr);
-		if (BasicLTIUtil.isNotBlank(sakaiRole)) {
-			log.debug("sakaiRole from SakaiBLTIUtil.mapInboundRole={}", sakaiRole);
+		String sakaiRole = SakaiLTIUtil.mapInboundRole(ltiRole, siteRoles, inboundMapStr);
+		if (LTIUtil.isNotBlank(sakaiRole)) {
+			log.debug("sakaiRole from SakaiLTIUtil.mapInboundRole={}", sakaiRole);
 			return new AbstractMap.SimpleImmutableEntry(ltiRole, sakaiRole);
 		}
 
 		// Check if the incoming IMS Role matches a role in the site (not likely)
 		for (String matchRole : siteRoles) {
-			if (BasicLTIUtil.equalsIgnoreCase(matchRole, ltiRole)) {
+			if (LTIUtil.equalsIgnoreCase(matchRole, ltiRole)) {
 				log.debug("Matched incoming role={} to role in site: {}", ltiRole, matchRole);
 				return new AbstractMap.SimpleImmutableEntry(ltiRole, matchRole);
 			}
@@ -103,7 +103,7 @@ public Map.Entry<String, String> mapLTIRole(Map payload, User user, Site site, b
 			// http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor#TeachingAssistant
 			for(String piece : ltiRole.split("#") ) {
 				if ( piece.startsWith("http://") || piece.startsWith("https://") ) continue;
-				if (BasicLTIUtil.equalsIgnoreCase(sakaiRole, piece)) {
+				if (LTIUtil.equalsIgnoreCase(sakaiRole, piece)) {
 					log.debug("Matched incoming role={} to site role: {}", piece, sakaiRole);
 					return new AbstractMap.SimpleImmutableEntry(ltiRole, sakaiRole);
 				}
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTISecurityServiceImpl.java
similarity index 87%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTISecurityServiceImpl.java
index 16b7f8c79bc8..dc0efced80d1 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/LTISecurityServiceImpl.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sakaiproject.basiclti.impl;
+package org.sakaiproject.lti.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -75,8 +75,8 @@
 import org.sakaiproject.site.api.SitePage;
 import org.sakaiproject.site.api.ToolConfiguration;
 
-import org.sakaiproject.basiclti.LocalEventTrackingService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.LocalEventTrackingService;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.lti13.util.SakaiLineItem;
 import org.sakaiproject.lti13.LineItemUtil;
 
@@ -84,8 +84,8 @@
 
 @SuppressWarnings("deprecation")
 @Slf4j
-public class BasicLTISecurityServiceImpl implements EntityProducer {
-	public static final String SERVICE_NAME = BasicLTISecurityServiceImpl.class.getName();
+public class LTISecurityServiceImpl implements EntityProducer {
+	public static final String SERVICE_NAME = LTISecurityServiceImpl.class.getName();
 
 	private static ResourceLoader rb = new ResourceLoader("basicltisvc");
 	
@@ -100,7 +100,7 @@ public class BasicLTISecurityServiceImpl implements EntityProducer {
 	public static final String REFERENCE_ROOT_LEGACY="/basiclti";
 	public static final String APPLICATION_ID = "sakai:basiclti";
 	public static final String TOOL_REGISTRATION = "sakai.basiclti";
-	public static final String EVENT_BASICLTI_LAUNCH = "basiclti.launch";
+	public static final String EVENT_LTI_LAUNCH = "basiclti.launch";
 
 	// Note: security needs a proper Resource reference
 
@@ -168,8 +168,8 @@ public void init()
 
 		log.info("{}.init()", this);
 
-		if (ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_ENCRYPTION_KEY, null) == null) {
-			log.error("LTI secrets in database unencrypted, please set {}", SakaiBLTIUtil.BASICLTI_ENCRYPTION_KEY);
+		if (ServerConfigurationService.getString(SakaiLTIUtil.LTI_ENCRYPTION_KEY, null) == null) {
+			log.error("LTI secrets in database unencrypted, please set {}", SakaiLTIUtil.LTI_ENCRYPTION_KEY);
 		}
 		try
 		{
@@ -196,7 +196,7 @@ public void destroy()
 	/**
 	 *
 	 */
-	public BasicLTISecurityServiceImpl() {
+	public LTISecurityServiceImpl() {
 		super();
 
 	}
@@ -254,7 +254,7 @@ private void doSplash(HttpServletRequest req, HttpServletResponse res, String sp
 		body += rb.getString("launch.button", "Press to continue to proceed to external tool.");
 		body += "\"></form></p>\n";
 		body += splash+"</div><p>";
-		org.tsugi.basiclti.BasicLTIUtil.sendHTMLPage(res, body);
+		org.tsugi.lti.LTIUtil.sendHTMLPage(res, body);
 	}
 
 	// Do a redirect in HTML + JavaScript instead of with a 302 so we have some recovery options inside an iframe
@@ -276,7 +276,7 @@ private void doRedirect(HttpServletRequest req, HttpServletResponse res, String
 		body.append("window.location='"+redirectUrl+"';\n");
 		body.append("</script>\n");
 		body.append("</div>");
-		org.tsugi.basiclti.BasicLTIUtil.sendHTMLPage(res, body.toString());
+		org.tsugi.lti.LTIUtil.sendHTMLPage(res, body.toString());
 	}
 
 	/*
@@ -292,7 +292,7 @@ private void redirectOIDC(HttpServletRequest req, HttpServletResponse res,
 		// req.getRequestURI()=/access/lti/site/85fd092b-1755-4aa9-8abc-e6549527dce0/content:0
 		String login_hint = req.getRequestURI();
 		String query_string = req.getQueryString();
-		String messageTypeParm = req.getParameter(SakaiBLTIUtil.MESSAGE_TYPE_PARAMETER);
+		String messageTypeParm = req.getParameter(SakaiLTIUtil.MESSAGE_TYPE_PARAMETER);
 
 		if ( StringUtils.isNotEmpty(query_string)) {
 			login_hint = login_hint + "?" + query_string;
@@ -308,24 +308,24 @@ private void redirectOIDC(HttpServletRequest req, HttpServletResponse res,
 			String lineItemStr = (String) content.get(LTIService.LTI_LINEITEM);
 			SakaiLineItem sakaiLineItem = LineItemUtil.parseLineItem(lineItemStr);
 
-			if ( SakaiBLTIUtil.MESSAGE_TYPE_PARAMETER_CONTENT_REVIEW.equals(messageTypeParm)) {
+			if ( SakaiLTIUtil.MESSAGE_TYPE_PARAMETER_CONTENT_REVIEW.equals(messageTypeParm)) {
 				if ( sakaiLineItem != null && sakaiLineItem.submissionReview != null && StringUtils.isNotEmpty(sakaiLineItem.submissionReview.url) ) launch_url = sakaiLineItem.submissionReview.url;
 			}
 		}
 
 		String client_id = StringUtils.trimToNull((String) tool.get(LTIService.LTI13_CLIENT_ID));
-		String deployment_id = ServerConfigurationService.getString(SakaiBLTIUtil.LTI13_DEPLOYMENT_ID, SakaiBLTIUtil.LTI13_DEPLOYMENT_ID_DEFAULT);
+		String deployment_id = ServerConfigurationService.getString(SakaiLTIUtil.LTI13_DEPLOYMENT_ID, SakaiLTIUtil.LTI13_DEPLOYMENT_ID_DEFAULT);
 
 		byte[] bytesEncoded = Base64.encodeBase64(login_hint.getBytes());
 		String encoded_login_hint = new String(bytesEncoded);
 		try {
 			URIBuilder redirect = new URIBuilder(oidc_endpoint.trim());
-			redirect.addParameter("iss", SakaiBLTIUtil.getOurServerUrl());
+			redirect.addParameter("iss", SakaiLTIUtil.getOurServerUrl());
 			redirect.addParameter("login_hint", encoded_login_hint);
 			redirect.addParameter("lti_storage_target", "_parent");
 			if ( client_id != null ) redirect.addParameter("client_id", client_id);
 			if ( deployment_id != null ) redirect.addParameter("lti_deployment_id", deployment_id);
-			SakaiBLTIUtil.addSakaiBaseCapabilities(redirect);
+			SakaiLTIUtil.addSakaiBaseCapabilities(redirect);
 			if (StringUtils.isNotBlank(launch_url)) {
 				redirect.addParameter("target_link_uri", launch_url);
 			}
@@ -344,9 +344,9 @@ private boolean sanityCheck(HttpServletRequest req, HttpServletResponse res,
 	{
 
 		String oidc_endpoint = (String) tool.get(LTIService.LTI13_TOOL_ENDPOINT);
-		if (SakaiBLTIUtil.isLTI13(tool, content) && StringUtils.isBlank(oidc_endpoint) ) {
-			String errorMessage = "<p>" + SakaiBLTIUtil.getRB(rb, "error.no.oidc_endpoint", "Missing oidc_endpoint value for LTI 1.3 launch") + "</p>";
-			org.tsugi.basiclti.BasicLTIUtil.sendHTMLPage(res, errorMessage);
+		if (SakaiLTIUtil.isLTI13(tool, content) && StringUtils.isBlank(oidc_endpoint) ) {
+			String errorMessage = "<p>" + SakaiLTIUtil.getRB(rb, "error.no.oidc_endpoint", "Missing oidc_endpoint value for LTI 1.3 launch") + "</p>";
+			org.tsugi.lti.LTIUtil.sendHTMLPage(res, errorMessage);
 			return false;
 		}
 
@@ -389,7 +389,7 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere
 						if ( value == null ) continue;
 						propData.setProperty(key,value);
 					}
-					Long toolKey = SakaiBLTIUtil.getLongKey(toolStr);
+					Long toolKey = SakaiLTIUtil.getLongKey(toolStr);
 					if (toolKey < 1 ) {
 						throw new EntityNotDefinedException("Could not load tool");
 					}
@@ -415,13 +415,13 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere
 					// Sanity check for missing config data
 					if ( ! sanityCheck(req, res, null, tool, rb) ) return;
 
-					if (SakaiBLTIUtil.isLTI13(tool, null) && StringUtils.isNotBlank(oidc_endpoint) &&
+					if (SakaiLTIUtil.isLTI13(tool, null) && StringUtils.isNotBlank(oidc_endpoint) &&
 							( StringUtils.isEmpty(state) || StringUtils.isEmpty(state) ) ) {
 						redirectOIDC(req, res, null, tool, oidc_endpoint, rb);
 						return;
 					}
 
-					retval = SakaiBLTIUtil.postContentItemSelectionRequest(toolKey, tool, state, nonce, rb, contentReturn, propData);
+					retval = SakaiLTIUtil.postContentItemSelectionRequest(toolKey, tool, state, nonce, rb, contentReturn, propData);
 
 				}
 				else if ( refId.startsWith("content:") && refId.length() > 8 )
@@ -430,7 +430,7 @@ else if ( refId.startsWith("content:") && refId.length() > 8 )
 					Map<String,Object> tool = null;
 
 					String contentStr = refId.substring(8);
-					Long contentKey = SakaiBLTIUtil.getLongKey(contentStr);
+					Long contentKey = SakaiLTIUtil.getLongKey(contentStr);
 					if (contentKey < 1 ) {
 						throw new EntityNotDefinedException("Could not load content item");
 					}
@@ -441,23 +441,23 @@ else if ( refId.startsWith("content:") && refId.length() > 8 )
 					}
 
 					// Check to see if we need launch protection
-					int protect = SakaiBLTIUtil.getInt(content.get(LTIService.LTI_PROTECT));
-					String launch_code_key = SakaiBLTIUtil.getLaunchCodeKey(content);
+					int protect = SakaiLTIUtil.getInt(content.get(LTIService.LTI_PROTECT));
+					String launch_code_key = SakaiLTIUtil.getLaunchCodeKey(content);
 					Session session = sessionManager.getCurrentSession();
 
 					// SAK-43709 - Prior to Sakai-21 there is no protect field in Content
 					// If there is no protect value, we fall back to the pre-21 description in JSON
 					if ( protect < 0 ) {
 						String content_settings = (String) content.get(LTIService.LTI_SETTINGS);
-						JSONObject content_json = org.tsugi.basiclti.BasicLTIUtil.parseJSONObject(content_settings);
-						protect = SakaiBLTIUtil.getInt(content_json.get(LTIService.LTI_PROTECT));
+						JSONObject content_json = org.tsugi.lti.LTIUtil.parseJSONObject(content_settings);
+						protect = SakaiLTIUtil.getInt(content_json.get(LTIService.LTI_PROTECT));
 					}
 
 					if ( protect > 0 && ! checkSiteUpdate(ref) ) {
 						String launch_code = (String) session.getAttribute(launch_code_key);
 
 						// We don't remove the token until later because LTI 1.3 pass through this twice
-						if ( launch_code == null || ! SakaiBLTIUtil.checkLaunchCode(content, launch_code) ) {
+						if ( launch_code == null || ! SakaiLTIUtil.checkLaunchCode(content, launch_code) ) {
 							throw new EntityPermissionException(sessionManager.getCurrentSessionUserId(), "basiclti", ref.getReference());
 						}
 					}
@@ -468,7 +468,7 @@ else if ( refId.startsWith("content:") && refId.length() > 8 )
 						throw new EntityNotDefinedException("Incorrect site");
 					}
 
-					Long toolKey = SakaiBLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID));
+					Long toolKey = SakaiLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID));
 					if ( toolKey >= 0 ) tool = ltiService.getTool(toolKey, ref.getContext());
 
 					ltiService.filterContent(content, tool);
@@ -495,14 +495,14 @@ else if ( refId.startsWith("content:") && refId.length() > 8 )
 						// Sanity check for missing config data
 						if ( ! sanityCheck(req, res, content, tool, rb) ) return;
 
-						if (SakaiBLTIUtil.isLTI13(tool, content) && StringUtils.isNotBlank(oidc_endpoint) &&
+						if (SakaiLTIUtil.isLTI13(tool, content) && StringUtils.isNotBlank(oidc_endpoint) &&
 								(StringUtils.isEmpty(state) || StringUtils.isEmpty(nonce) ) ) {
 							redirectOIDC(req, res, content, tool, oidc_endpoint, rb);
 							return;
 						}
 					}
 
-					retval = SakaiBLTIUtil.postLaunchHTML(content, tool, state, nonce, ltiService, rb);
+					retval = SakaiLTIUtil.postLaunchHTML(content, tool, state, nonce, ltiService, rb);
 
 					// Once we are ready to do the actual launch, remove the assignments protection key
 					session.removeAttribute(launch_code_key);  // You get one try
@@ -571,8 +571,8 @@ else if (refId.startsWith("export:") && refId.length() > 7)
 						if ( placement != null )
 						{
 							// XSS Note: Only the Administrator can set overridesplash - so we allow HTML
-							String splash = SakaiBLTIUtil.toNull(SakaiBLTIUtil.getCorrectProperty(config,"overridesplash", placement));
-							String send_session = SakaiBLTIUtil.toNull(SakaiBLTIUtil.getCorrectProperty(config,"ext_sakai_encrypted_session", placement));
+							String splash = SakaiLTIUtil.toNull(SakaiLTIUtil.getCorrectProperty(config,"overridesplash", placement));
+							String send_session = SakaiLTIUtil.toNull(SakaiLTIUtil.getCorrectProperty(config,"ext_sakai_encrypted_session", placement));
 							if ( splash == null && send_session != null && send_session.equals("true") && ! securityService.isSuperUser() )
 							{
 								splash = rb.getString("session.warning", "<p><span style=\"color:red\">Warning:</span> This tool makes use of your logged in session.  This means that the tool can access your data in this system.  Only continue to this tool if you are willing to share your data with this tool.</p>");
@@ -580,14 +580,14 @@ else if (refId.startsWith("export:") && refId.length() > 7)
 							if ( splash == null )
 							{
 								// This may be user-set so no HTML
-								splash = SakaiBLTIUtil.toNull(SakaiBLTIUtil.getCorrectProperty(config,"splash", placement));
+								splash = SakaiLTIUtil.toNull(SakaiLTIUtil.getCorrectProperty(config,"splash", placement));
 								if ( splash != null ) splash = formattedText.escapeHtml(splash,false);
 							}
 
 							// XSS Note: Only the Administrator can set defaultsplash - so we allow HTML
 							if ( splash == null )
 							{
-								splash = SakaiBLTIUtil.toNull(SakaiBLTIUtil.getCorrectProperty(config,"defaultsplash", placement));
+								splash = SakaiLTIUtil.toNull(SakaiLTIUtil.getCorrectProperty(config,"defaultsplash", placement));
 							}
 
 							if ( splash != null && splash.trim().length() > 1 )
@@ -599,21 +599,21 @@ else if (refId.startsWith("export:") && refId.length() > 7)
 					}
 
 					// Get the post data for the placement
-					retval = SakaiBLTIUtil.postLaunchHTML(refId, rb);
+					retval = SakaiLTIUtil.postLaunchHTML(refId, rb);
 				}
 
 				try
 				{
 					if (retval != null) {
-						org.tsugi.basiclti.BasicLTIUtil.sendHTMLPage(res, retval[0]);
+						org.tsugi.lti.LTIUtil.sendHTMLPage(res, retval[0]);
 					}
 					String refstring = ref.getReference();
 					if ( retval != null && retval.length > 1 ) refstring = retval[1];
-					Event event = LocalEventTrackingService.newEvent(EVENT_BASICLTI_LAUNCH, refstring, ref.getContext(),  false, NotificationService.NOTI_OPTIONAL);
+					Event event = LocalEventTrackingService.newEvent(EVENT_LTI_LAUNCH, refstring, ref.getContext(),  false, NotificationService.NOTI_OPTIONAL);
 					// SAK-24069 - Extend Sakai session lifetime on LTI tool launch
 					Session session = sessionManager.getCurrentSession();
 					if (session !=null) {
-						int seconds = ServerConfigurationService.getInt(SakaiBLTIUtil.BASICLTI_LAUNCH_SESSION_TIMEOUT, 10800);
+						int seconds = ServerConfigurationService.getInt(SakaiLTIUtil.LTI_LAUNCH_SESSION_TIMEOUT, 10800);
 						if ( seconds != 0 ) session.setMaxInactiveInterval(seconds);
 					}
 
@@ -686,7 +686,7 @@ public boolean willArchiveMerge()
 		public String merge(String siteId, Element root, String archivePath, String fromSiteId, Map attachmentNames, Map userIdTrans,
 				Set userListAllowImport)
 		{
-			StringBuilder results = new StringBuilder("Merging BasicLTI ");
+			StringBuilder results = new StringBuilder("Merging LTI ");
 			org.w3c.dom.NodeList nodeList = root.getElementsByTagName("basicLTI");
 
 			try {
@@ -694,7 +694,7 @@ public String merge(String siteId, Element root, String archivePath, String from
 
 				for(int i=0; i < nodeList.getLength(); i++)
 				{
-					BasicLTIArchiveBean basicLTI = new BasicLTIArchiveBean(nodeList.item(i));
+					LTIArchiveBean basicLTI = new LTIArchiveBean(nodeList.item(i));
 					log.info("LTI: {}", basicLTI);
 					results.append(", merging basicLTI tool " + basicLTI.getPageTitle());
 
@@ -734,7 +734,7 @@ public String archive(String siteId, Document doc, Stack stack, String archivePa
 			try {
 				Site site = siteService.getSite(siteId);
 				log.info("SITE: {} : {}", site.getId(), site.getTitle());
-				Element basicLtiList = doc.createElement("org.sakaiproject.basiclti.service.BasicLTISecurityService");
+				Element basicLtiList = doc.createElement("org.sakaiproject.lti.service.LTISecurityService");
 
 				// Export the LTI tools
 				for (SitePage sitePage : site.getPages()) {
@@ -745,7 +745,7 @@ public String archive(String siteId, Document doc, Stack stack, String archivePa
 							// results.append(" tool=" + toolConfiguration.getId() + "\n");
 							count++;
 
-							BasicLTIArchiveBean basicLTIArchiveBean = new BasicLTIArchiveBean();
+							LTIArchiveBean basicLTIArchiveBean = new LTIArchiveBean();
 							basicLTIArchiveBean.setPageTitle(sitePage.getTitle());
 							basicLTIArchiveBean.setToolTitle(toolConfiguration.getTitle());
 							basicLTIArchiveBean.setSiteToolProperties(toolConfiguration.getConfig());
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SampleLTISubstitutionsFilter.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/SampleLTISubstitutionsFilter.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SampleLTISubstitutionsFilter.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/SampleLTISubstitutionsFilter.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteEmailPreferenceSetterImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteEmailPreferenceSetterImpl.java
similarity index 100%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteEmailPreferenceSetterImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteEmailPreferenceSetterImpl.java
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipUpdaterImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipUpdaterImpl.java
similarity index 96%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipUpdaterImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipUpdaterImpl.java
index 079560859330..6c71d3f404a1 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipUpdaterImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipUpdaterImpl.java
@@ -1,5 +1,5 @@
 /**
- * $URL: https://source.sakaiproject.org/svn/basiclti/trunk/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java $
+ * $URL: https://source.sakaiproject.org/svn/lti/trunk/lti-portlet/src/java/org.sakaiproject.lti/ProviderServlet.java $
  * $Id: ProviderServlet.java 310276 2014-06-17 09:29:09Z a.fish@lancaster.ac.uk $
  *
  * Copyright (c) 2009 The Sakai Foundation
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java
similarity index 95%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java
index bd294eb63904..9006296a1b07 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java
@@ -37,11 +37,11 @@
 
 import net.oauth.signature.OAuthSignatureMethod;
 
-import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.lti.LTIConstants;
 
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.cover.SecurityService;
-import org.sakaiproject.basiclti.util.LegacyShaUtil;
+import org.sakaiproject.lti.util.LegacyShaUtil;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.exception.IdUnusedException;
 import org.sakaiproject.lti.api.SiteMembershipUpdater;
@@ -102,7 +102,7 @@ public void synchroniseSiteMemberships(final String siteId, final String members
             return;
         }
 
-        if (BasicLTIConstants.LTI_VERSION_1.equals(callbackType)) {
+        if (LTIConstants.LTI_VERSION_1.equals(callbackType)) {
             synchronizeLTI1SiteMemberships(site, membershipsId, membershipsUrl, oauth_consumer_key, isEmailTrustedConsumer);
         } else if ("ext-moodle-2".equals(callbackType)) {
             // This is non standard. Moodle's core LTI plugin does not currently do memberships and 
@@ -129,8 +129,8 @@ private final void synchronizeLTI1SiteMemberships(final Site site, final String
         om.addParameter(OAuth.OAUTH_VERSION, "1.0");
         om.addParameter(OAuth.OAUTH_TIMESTAMP, new Long((new Date().getTime()) / 1000).toString());
         om.addParameter(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());
-        om.addParameter(BasicLTIConstants.LTI_MESSAGE_TYPE, "basic-lis-readmembershipsforcontext");
-        om.addParameter(BasicLTIConstants.LTI_VERSION, "LTI-1p0");
+        om.addParameter(LTIConstants.LTI_MESSAGE_TYPE, "basic-lis-readmembershipsforcontext");
+        om.addParameter(LTIConstants.LTI_VERSION, "LTI-1p0");
         om.addParameter("id", membershipsId);
 
         OAuthConsumer oc = new OAuthConsumer(null, oauth_consumer_key, oauth_secret, null);
@@ -267,11 +267,11 @@ private void processMembershipsResponse(HttpURLConnection connection, Site site,
         for (POXMembershipsResponse.Member member : members) {
 
             Map map = new HashMap();
-            map.put(BasicLTIConstants.USER_ID, member.userId);
-            map.put(BasicLTIConstants.LIS_PERSON_NAME_GIVEN, member.firstName);
-            map.put(BasicLTIConstants.LIS_PERSON_NAME_FAMILY, member.lastName);
-            map.put(BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, member.email);
-            map.put(BasicLTIConstants.ROLES, member.role);
+            map.put(LTIConstants.USER_ID, member.userId);
+            map.put(LTIConstants.LIS_PERSON_NAME_GIVEN, member.firstName);
+            map.put(LTIConstants.LIS_PERSON_NAME_FAMILY, member.lastName);
+            map.put(LTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, member.email);
+            map.put(LTIConstants.ROLES, member.role);
             map.put(OAuth.OAUTH_CONSUMER_KEY, oauth_consumer_key);
             map.put("tool_id", "n/a");
 
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java
similarity index 86%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java
index ee043d9b212c..007fadedc888 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java
@@ -23,8 +23,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
 
 import org.sakaiproject.id.cover.IdManager;
 import org.sakaiproject.lti.api.LTIException;
@@ -47,7 +47,7 @@ public User findOrCreateUser(Map payload, boolean trustedConsumer, boolean email
 
 		User user;
 		String eid=null;
-		String user_id = (String) payload.get(BasicLTIConstants.USER_ID);
+		String user_id = (String) payload.get(LTIConstants.USER_ID);
 
 		// Get the eid, either from the value provided or if trusted get it from the user_id, otherwise construct it.
 		if(!emailtrusted){
@@ -55,10 +55,10 @@ public User findOrCreateUser(Map payload, boolean trustedConsumer, boolean email
 		}
 
 		// If we did not get first and last name, split lis_person_name_full
-		final String fullname = (String) payload.get(BasicLTIConstants.LIS_PERSON_NAME_FULL);
-		String fname = (String) payload.get(BasicLTIConstants.LIS_PERSON_NAME_GIVEN);
-		String lname = (String) payload.get(BasicLTIConstants.LIS_PERSON_NAME_FAMILY);
-		String email = (String) payload.get(BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY);
+		final String fullname = (String) payload.get(LTIConstants.LIS_PERSON_NAME_FULL);
+		String fname = (String) payload.get(LTIConstants.LIS_PERSON_NAME_GIVEN);
+		String lname = (String) payload.get(LTIConstants.LIS_PERSON_NAME_FAMILY);
+		String email = (String) payload.get(LTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY);
 		String subject_guid = (String) payload.get("subject_guid");
 		if (emailtrusted && StringUtils.isEmpty(email)) {
 			log.warn("trusting email as eid, no email provided subject_guid={}", subject_guid);
@@ -80,7 +80,7 @@ public User findOrCreateUser(Map payload, boolean trustedConsumer, boolean email
 		// otherwise this will fail since they don't exist. Perhaps this should be addressed?
 		if (trustedConsumer) {
 			try {
-				if (BasicLTIUtil.isNotBlank((String) payload.get(BasicLTIConstants.EXT_SAKAI_PROVIDER_EID))) {
+				if (LTIUtil.isNotBlank((String) payload.get(LTIConstants.EXT_SAKAI_PROVIDER_EID))) {
 					user = userDirectoryService.getUserByEid(eid);
 				} else {
 					user = userDirectoryService.getUser(user_id);
@@ -151,10 +151,10 @@ private String getEid(Map payload, boolean trustedConsumer, String user_id) thro
 		String eid;
 		String oauth_consumer_key = (String) payload.get("oauth_consumer_key");
 		String subject_guid = (String) payload.get("subject_guid");
-		String ext_sakai_provider_eid = (String) payload.get(BasicLTIConstants.EXT_SAKAI_PROVIDER_EID);
+		String ext_sakai_provider_eid = (String) payload.get(LTIConstants.EXT_SAKAI_PROVIDER_EID);
 
-		if (BasicLTIUtil.isNotBlank(ext_sakai_provider_eid)){
-			eid = (String) payload.get(BasicLTIConstants.EXT_SAKAI_PROVIDER_EID);
+		if (LTIUtil.isNotBlank(ext_sakai_provider_eid)){
+			eid = (String) payload.get(LTIConstants.EXT_SAKAI_PROVIDER_EID);
 		} else {
 
 			if (trustedConsumer) {
@@ -164,7 +164,7 @@ private String getEid(Map payload, boolean trustedConsumer, String user_id) thro
 					log.error(e.getLocalizedMessage(), e);
 					throw new LTIException( "launch.user.invalid", "user_id="+user_id, e);
 				}
-			} else if ( BasicLTIUtil.isNotBlank(subject_guid) ) {
+			} else if ( LTIUtil.isNotBlank(subject_guid) ) {
 				eid = "subject:" + subject_guid;
 			} else {
 				eid = oauth_consumer_key + ":" + user_id;
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java
similarity index 95%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java
index 3b62d651902a..305fd0ed9cd1 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java
@@ -20,7 +20,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.lti.LTIConstants;
 
 import org.sakaiproject.entity.api.ResourcePropertiesEdit;
 import org.sakaiproject.exception.IdUnusedException;
@@ -47,7 +47,7 @@ public void setupUserLocale(Map payload, User user, boolean isTrustedConsumer, b
         if (isTrustedConsumer) return;
         if (isEmailTrustedConsumer) return;
 
-        String locale = (String) payload.get(BasicLTIConstants.LAUNCH_PRESENTATION_LOCALE);
+        String locale = (String) payload.get(LTIConstants.LAUNCH_PRESENTATION_LOCALE);
         if (user != null && locale != null && !locale.isEmpty()) {
             String userId = user.getId();
             PreferencesEdit preference = null;
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java
similarity index 92%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java
index d3a06a71f712..6a56c600e836 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java
@@ -20,7 +20,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.lti.LTIConstants;
 
 import org.sakaiproject.lti.api.UserPictureSetter;
 import org.sakaiproject.profile2.logic.ProfileImageLogic;
@@ -45,7 +45,7 @@ public void setProfilePreferencesLogic(ProfilePreferencesLogic profilePreference
     }
 
     /**
-     * BLTI-155. If Profile2 is installed, set the profile picture to the user_image url, if supplied.
+     * LTI-155. If Profile2 is installed, set the profile picture to the user_image url, if supplied.
      * 
      * @param payload The LTI launch parameters in a Map
      * @param user The provisioned user who MUST be already logged in.
@@ -59,7 +59,7 @@ public void setupUserPicture(Map payload, User user, boolean isTrustedConsumer,
     	if(isTrustedConsumer) return;
     	if(isEmailTrustedConsumer)return;
     	
-    	String imageUrl = (String) payload.get(BasicLTIConstants.USER_IMAGE);
+    	String imageUrl = (String) payload.get(LTIConstants.USER_IMAGE);
     	        
     	if(imageUrl != null && imageUrl.length() > 0) {
     		log.debug("User image supplied by consumer: {}", imageUrl);
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java
similarity index 97%
rename from basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java
rename to lti/lti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java
index bc21598ff5ad..e576204b4148 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java
+++ b/lti/lti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java
@@ -24,7 +24,7 @@
 import org.quartz.JobExecutionException;
 import org.quartz.StatefulJob;
 
-import org.sakaiproject.basiclti.util.SakaiLTIProviderUtil;
+import org.sakaiproject.lti.util.SakaiLTIProviderUtil;
 import org.sakaiproject.lti.api.LTIService;
 import org.sakaiproject.lti.api.SiteMembershipsSynchroniser;
 
diff --git a/basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/FoormSakaiTest.java b/lti/lti-impl/src/test/org/sakaiproject/util/foorm/FoormSakaiTest.java
similarity index 100%
rename from basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/FoormSakaiTest.java
rename to lti/lti-impl/src/test/org/sakaiproject/util/foorm/FoormSakaiTest.java
diff --git a/basiclti/basiclti-impl/src/webapp/WEB-INF/components-demo.xml b/lti/lti-impl/src/webapp/WEB-INF/components-demo.xml
similarity index 100%
rename from basiclti/basiclti-impl/src/webapp/WEB-INF/components-demo.xml
rename to lti/lti-impl/src/webapp/WEB-INF/components-demo.xml
diff --git a/basiclti/basiclti-impl/src/webapp/WEB-INF/components.xml b/lti/lti-impl/src/webapp/WEB-INF/components.xml
similarity index 98%
rename from basiclti/basiclti-impl/src/webapp/WEB-INF/components.xml
rename to lti/lti-impl/src/webapp/WEB-INF/components.xml
index d0460c305180..62eb7a8c9258 100644
--- a/basiclti/basiclti-impl/src/webapp/WEB-INF/components.xml
+++ b/lti/lti-impl/src/webapp/WEB-INF/components.xml
@@ -3,8 +3,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-        <bean id="org.sakaiproject.basiclti.service.BasicLTISecurityService"
-                class="org.sakaiproject.basiclti.impl.BasicLTISecurityServiceImpl"
+        <bean id="org.sakaiproject.lti.service.LTISecurityService"
+                class="org.sakaiproject.lti.impl.LTISecurityServiceImpl"
                 init-method="init"
                 destroy-method="destroy">
                 <property name="formattedText" ref="org.sakaiproject.util.api.FormattedText" />
diff --git a/basiclti/basiclti-oidc/maven.xml b/lti/lti-oidc/maven.xml
similarity index 100%
rename from basiclti/basiclti-oidc/maven.xml
rename to lti/lti-oidc/maven.xml
diff --git a/basiclti/basiclti-oidc/pom.xml b/lti/lti-oidc/pom.xml
similarity index 87%
rename from basiclti/basiclti-oidc/pom.xml
rename to lti/lti-oidc/pom.xml
index 3671ccdc1c58..070dde534c1c 100644
--- a/basiclti/basiclti-oidc/pom.xml
+++ b/lti/lti-oidc/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
     <name>LTI OIDC Servlet (imsoidc)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
+    <groupId>org.sakaiproject.lti</groupId>
     <artifactId>imsoidc</artifactId>
     <packaging>war</packaging>
 
@@ -20,15 +20,15 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11.properties b/lti/lti-oidc/src/bundle/lti11.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11.properties
rename to lti/lti-oidc/src/bundle/lti11.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_ar.properties b/lti/lti-oidc/src/bundle/lti11_ar.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_ar.properties
rename to lti/lti-oidc/src/bundle/lti11_ar.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_bg.properties b/lti/lti-oidc/src/bundle/lti11_bg.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_bg.properties
rename to lti/lti-oidc/src/bundle/lti11_bg.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_ca.properties b/lti/lti-oidc/src/bundle/lti11_ca.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_ca.properties
rename to lti/lti-oidc/src/bundle/lti11_ca.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_de_DE.properties b/lti/lti-oidc/src/bundle/lti11_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_de_DE.properties
rename to lti/lti-oidc/src/bundle/lti11_de_DE.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_es.properties b/lti/lti-oidc/src/bundle/lti11_es.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_es.properties
rename to lti/lti-oidc/src/bundle/lti11_es.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_eu.properties b/lti/lti-oidc/src/bundle/lti11_eu.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_eu.properties
rename to lti/lti-oidc/src/bundle/lti11_eu.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_fa_IR.properties b/lti/lti-oidc/src/bundle/lti11_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_fa_IR.properties
rename to lti/lti-oidc/src/bundle/lti11_fa_IR.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_fr_FR.properties b/lti/lti-oidc/src/bundle/lti11_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_fr_FR.properties
rename to lti/lti-oidc/src/bundle/lti11_fr_FR.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_hi_IN.properties b/lti/lti-oidc/src/bundle/lti11_hi_IN.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_hi_IN.properties
rename to lti/lti-oidc/src/bundle/lti11_hi_IN.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_ja.properties b/lti/lti-oidc/src/bundle/lti11_ja.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_ja.properties
rename to lti/lti-oidc/src/bundle/lti11_ja.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_pt_BR.properties b/lti/lti-oidc/src/bundle/lti11_pt_BR.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_pt_BR.properties
rename to lti/lti-oidc/src/bundle/lti11_pt_BR.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_ro_RO.properties b/lti/lti-oidc/src/bundle/lti11_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_ro_RO.properties
rename to lti/lti-oidc/src/bundle/lti11_ro_RO.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_sr.properties b/lti/lti-oidc/src/bundle/lti11_sr.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_sr.properties
rename to lti/lti-oidc/src/bundle/lti11_sr.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_tr_TR.properties b/lti/lti-oidc/src/bundle/lti11_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_tr_TR.properties
rename to lti/lti-oidc/src/bundle/lti11_tr_TR.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/lti11_zh_CN.properties b/lti/lti-oidc/src/bundle/lti11_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/lti11_zh_CN.properties
rename to lti/lti-oidc/src/bundle/lti11_zh_CN.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc.properties b/lti/lti-oidc/src/bundle/oidc.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc.properties
rename to lti/lti-oidc/src/bundle/oidc.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_ar.properties b/lti/lti-oidc/src/bundle/oidc_ar.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_ar.properties
rename to lti/lti-oidc/src/bundle/oidc_ar.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_bg.properties b/lti/lti-oidc/src/bundle/oidc_bg.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_bg.properties
rename to lti/lti-oidc/src/bundle/oidc_bg.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_ca.properties b/lti/lti-oidc/src/bundle/oidc_ca.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_ca.properties
rename to lti/lti-oidc/src/bundle/oidc_ca.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_de_DE.properties b/lti/lti-oidc/src/bundle/oidc_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_de_DE.properties
rename to lti/lti-oidc/src/bundle/oidc_de_DE.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_es.properties b/lti/lti-oidc/src/bundle/oidc_es.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_es.properties
rename to lti/lti-oidc/src/bundle/oidc_es.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_eu.properties b/lti/lti-oidc/src/bundle/oidc_eu.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_eu.properties
rename to lti/lti-oidc/src/bundle/oidc_eu.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_fr_FR.properties b/lti/lti-oidc/src/bundle/oidc_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_fr_FR.properties
rename to lti/lti-oidc/src/bundle/oidc_fr_FR.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_ro_RO.properties b/lti/lti-oidc/src/bundle/oidc_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_ro_RO.properties
rename to lti/lti-oidc/src/bundle/oidc_ro_RO.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_sr.properties b/lti/lti-oidc/src/bundle/oidc_sr.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_sr.properties
rename to lti/lti-oidc/src/bundle/oidc_sr.properties
diff --git a/basiclti/basiclti-oidc/src/bundle/oidc_tr_TR.properties b/lti/lti-oidc/src/bundle/oidc_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-oidc/src/bundle/oidc_tr_TR.properties
rename to lti/lti-oidc/src/bundle/oidc_tr_TR.properties
diff --git a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti11/LTI11AnonymousServlet.java b/lti/lti-oidc/src/java/org/sakaiproject/lti11/LTI11AnonymousServlet.java
similarity index 100%
rename from basiclti/basiclti-oidc/src/java/org/sakaiproject/lti11/LTI11AnonymousServlet.java
rename to lti/lti-oidc/src/java/org/sakaiproject/lti11/LTI11AnonymousServlet.java
diff --git a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java b/lti/lti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
similarity index 93%
rename from basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
rename to lti/lti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
index 863b7fd2ccb7..0e0eb3922df6 100644
--- a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
+++ b/lti/lti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
@@ -40,9 +40,9 @@
 import org.sakaiproject.lti.api.LTIService;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.component.cover.ComponentManager;
-import org.tsugi.basiclti.BasicLTIUtil;
-import org.tsugi.basiclti.ContentItem;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.tsugi.lti.LTIUtil;
+import org.tsugi.lti.ContentItem;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 
 import org.tsugi.lti13.LTI13Util;
 import org.apache.commons.lang3.StringUtils;
@@ -142,7 +142,7 @@ private void handleOIDCAuthorization(HttpServletRequest request, HttpServletResp
 		}
 
 		// /access/lti/site/477ded8b-2d67-4897-9e00-0afc4eb8ae20/content:7
-		// /access/basiclti/site/477ded8b-2d67-4897-9e00-0afc4eb8ae20/content:7
+		// /access/lti/site/477ded8b-2d67-4897-9e00-0afc4eb8ae20/content:7
 		if (!(login_hint.startsWith(LTIService.LAUNCH_PREFIX) || login_hint.startsWith(LTIService.LAUNCH_PREFIX_LEGACY))
 				|| dangerousCharacters(login_hint) ) {
 			LTI13Util.return400(response, "Bad format for login_hint");
@@ -215,7 +215,7 @@ private void handleResignContentItemResponse(HttpServletRequest request, HttpSer
 		String forward = Base64DoubleUrlEncodeSafe.decode((String) request.getParameter("forward"));
 		forward = StringUtils.trimToNull(forward);
 
-		Long toolKey = SakaiBLTIUtil.getLongKey((String) request.getParameter("tool_id"));
+		Long toolKey = SakaiLTIUtil.getLongKey((String) request.getParameter("tool_id"));
 		if ( StringUtils.isBlank(forward) || toolKey == null ) {
 			LTI13Util.return400(response, "Missing forward or tool_id value");
 			log.error("Missing forward or tool_id value");
@@ -291,9 +291,9 @@ private void handleResignContentItemResponse(HttpServletRequest request, HttpSer
 		}
 
 		String oauth_secret = (String) tool.get(LTIService.LTI_SECRET);
-		oauth_secret = SakaiBLTIUtil.decryptSecret(oauth_secret);
+		oauth_secret = SakaiLTIUtil.decryptSecret(oauth_secret);
 
-		String URL = SakaiBLTIUtil.getOurServletPath(request);
+		String URL = SakaiLTIUtil.getOurServletPath(request);
 
 		if (!contentItem.validate(oauth_consumer_key, oauth_secret, URL)) {
 			log.warn("Provider failed to validate message: {}", contentItem.getErrorMessage());
@@ -320,16 +320,16 @@ private void handleResignContentItemResponse(HttpServletRequest request, HttpSer
 		}
 
 		Map<String, String> extra = new HashMap<>();
-		extra.put(BasicLTIUtil.EXTRA_ERROR_TIMEOUT, rb.getString("oidc.continue"));
-		extra.put(BasicLTIUtil.EXTRA_HTTP_POPUP, BasicLTIUtil.EXTRA_HTTP_POPUP_FALSE);  // Don't bother opening in new window in protocol mismatch
-		extra.put(BasicLTIUtil.EXTRA_FORM_ID, "forwardform");
+		extra.put(LTIUtil.EXTRA_ERROR_TIMEOUT, rb.getString("oidc.continue"));
+		extra.put(LTIUtil.EXTRA_HTTP_POPUP, LTIUtil.EXTRA_HTTP_POPUP_FALSE);  // Don't bother opening in new window in protocol mismatch
+		extra.put(LTIUtil.EXTRA_FORM_ID, "forwardform");
 
-		ltiProps = BasicLTIUtil.signProperties(ltiProps, forward, "POST", oauth_consumer_key, oauth_secret, extra);
+		ltiProps = LTIUtil.signProperties(ltiProps, forward, "POST", oauth_consumer_key, oauth_secret, extra);
 
 		String launchtext = rb.getString("oidc.continue");
 		boolean autosubmit = false; // We will submit after checking the session cookie
 		boolean dodebug = serverUrl.startsWith("http://localhost");
-		String postData = BasicLTIUtil.postLaunchHTML(ltiProps, forward, launchtext, autosubmit, dodebug, extra);
+		String postData = LTIUtil.postLaunchHTML(ltiProps, forward, launchtext, autosubmit, dodebug, extra);
 
 		PrintWriter out = null;
 		try {
diff --git a/basiclti/basiclti-oidc/src/webapp/WEB-INF/applicationContext.xml b/lti/lti-oidc/src/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from basiclti/basiclti-oidc/src/webapp/WEB-INF/applicationContext.xml
rename to lti/lti-oidc/src/webapp/WEB-INF/applicationContext.xml
diff --git a/basiclti/basiclti-oidc/src/webapp/WEB-INF/web.xml b/lti/lti-oidc/src/webapp/WEB-INF/web.xml
similarity index 100%
rename from basiclti/basiclti-oidc/src/webapp/WEB-INF/web.xml
rename to lti/lti-oidc/src/webapp/WEB-INF/web.xml
diff --git a/basiclti/basiclti-oidc/src/webapp/whatisthis.htm b/lti/lti-oidc/src/webapp/whatisthis.htm
similarity index 100%
rename from basiclti/basiclti-oidc/src/webapp/whatisthis.htm
rename to lti/lti-oidc/src/webapp/whatisthis.htm
diff --git a/basiclti/basiclti-portlet/maven.xml b/lti/lti-portlet/maven.xml
similarity index 100%
rename from basiclti/basiclti-portlet/maven.xml
rename to lti/lti-portlet/maven.xml
diff --git a/basiclti/basiclti-portlet/pom.xml b/lti/lti-portlet/pom.xml
similarity index 91%
rename from basiclti/basiclti-portlet/pom.xml
rename to lti/lti-portlet/pom.xml
index 12bee9f01fa3..8cc50fc90263 100644
--- a/basiclti/basiclti-portlet/pom.xml
+++ b/lti/lti-portlet/pom.xml
@@ -3,28 +3,28 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
-    <name>BasicLTI Portlet (imsblti)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
+    <name>LTI Portlet (imsblti)</name>
+    <groupId>org.sakaiproject.lti</groupId>
     <artifactId>imsblti</artifactId>
     <packaging>war</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti.properties b/lti/lti-portlet/src/bundle/basiclti.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti.properties
rename to lti/lti-portlet/src/bundle/basiclti.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_ar.properties b/lti/lti-portlet/src/bundle/basiclti_ar.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_ar.properties
rename to lti/lti-portlet/src/bundle/basiclti_ar.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_bg.properties b/lti/lti-portlet/src/bundle/basiclti_bg.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_bg.properties
rename to lti/lti-portlet/src/bundle/basiclti_bg.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_ca.properties b/lti/lti-portlet/src/bundle/basiclti_ca.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_ca.properties
rename to lti/lti-portlet/src/bundle/basiclti_ca.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_de_DE.properties b/lti/lti-portlet/src/bundle/basiclti_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_de_DE.properties
rename to lti/lti-portlet/src/bundle/basiclti_de_DE.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_es.properties b/lti/lti-portlet/src/bundle/basiclti_es.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_es.properties
rename to lti/lti-portlet/src/bundle/basiclti_es.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_eu.properties b/lti/lti-portlet/src/bundle/basiclti_eu.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_eu.properties
rename to lti/lti-portlet/src/bundle/basiclti_eu.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_fa_IR.properties b/lti/lti-portlet/src/bundle/basiclti_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_fa_IR.properties
rename to lti/lti-portlet/src/bundle/basiclti_fa_IR.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_fr_FR.properties b/lti/lti-portlet/src/bundle/basiclti_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_fr_FR.properties
rename to lti/lti-portlet/src/bundle/basiclti_fr_FR.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_hi_IN.properties b/lti/lti-portlet/src/bundle/basiclti_hi_IN.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_hi_IN.properties
rename to lti/lti-portlet/src/bundle/basiclti_hi_IN.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_ja.properties b/lti/lti-portlet/src/bundle/basiclti_ja.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_ja.properties
rename to lti/lti-portlet/src/bundle/basiclti_ja.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_mn.properties b/lti/lti-portlet/src/bundle/basiclti_mn.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_mn.properties
rename to lti/lti-portlet/src/bundle/basiclti_mn.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_pt_BR.properties b/lti/lti-portlet/src/bundle/basiclti_pt_BR.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_pt_BR.properties
rename to lti/lti-portlet/src/bundle/basiclti_pt_BR.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_ro_RO.properties b/lti/lti-portlet/src/bundle/basiclti_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_ro_RO.properties
rename to lti/lti-portlet/src/bundle/basiclti_ro_RO.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_sr.properties b/lti/lti-portlet/src/bundle/basiclti_sr.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_sr.properties
rename to lti/lti-portlet/src/bundle/basiclti_sr.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_tr_TR.properties b/lti/lti-portlet/src/bundle/basiclti_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_tr_TR.properties
rename to lti/lti-portlet/src/bundle/basiclti_tr_TR.properties
diff --git a/basiclti/basiclti-portlet/src/bundle/basiclti_zh_CN.properties b/lti/lti-portlet/src/bundle/basiclti_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-portlet/src/bundle/basiclti_zh_CN.properties
rename to lti/lti-portlet/src/bundle/basiclti_zh_CN.properties
diff --git a/basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java b/lti/lti-portlet/src/java/org/sakaiproject/lti/ProviderServlet.java
similarity index 89%
rename from basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java
rename to lti/lti-portlet/src/java/org/sakaiproject/lti/ProviderServlet.java
index 7afe33f066ce..bc58802623b2 100644
--- a/basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java
+++ b/lti/lti-portlet/src/java/org/sakaiproject/lti/ProviderServlet.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sakaiproject.blti;
+package org.sakaiproject.lti;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -43,14 +43,14 @@
 import net.oauth.signature.OAuthSignatureMethod;
 
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
 
 import org.tsugi.contentitem.objects.ContentItemResponse;
 
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.cover.SecurityService;
-import org.sakaiproject.lti.api.BLTIProcessor;
+import org.sakaiproject.lti.api.LTIProcessor;
 import org.sakaiproject.lti.api.LTIException;
 import org.sakaiproject.lti.api.LTIService;
 import org.sakaiproject.lti.api.SiteEmailPreferenceSetter;
@@ -59,10 +59,10 @@
 import org.sakaiproject.lti.api.UserPictureSetter;
 import org.sakaiproject.lti.api.SiteMembershipUpdater;
 import org.sakaiproject.lti.api.SiteMembershipsSynchroniser;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiContentItemUtil;
-import org.sakaiproject.basiclti.util.SakaiLTIProviderUtil;
-import org.sakaiproject.basiclti.util.LegacyShaUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
+import org.sakaiproject.lti.util.SakaiContentItemUtil;
+import org.sakaiproject.lti.util.SakaiLTIProviderUtil;
+import org.sakaiproject.lti.util.LegacyShaUtil;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.event.cover.UsageSessionService;
@@ -111,7 +111,7 @@ public class ProviderServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;
 	private static ResourceLoader rb = new ResourceLoader("basiclti");
-	private static final String BASICLTI_RESOURCE_LINK = "blti:resource_link_id";
+	private static final String LTI_RESOURCE_LINK = "blti:resource_link_id";
     private static final String LTI_CONTEXT_ID = "lti_context_id";
 
     // All loaded from the component manager
@@ -123,7 +123,7 @@ public class ProviderServlet extends HttpServlet {
     private UserPictureSetter userPictureSetter = null;
     private LTIService ltiService = null;
 
-    private List<BLTIProcessor> bltiProcessors = new ArrayList();
+    private List<LTIProcessor> bltiProcessors = new ArrayList();
 
     private enum ProcessingState {
         beforeValidation, afterValidation, afterUserCreation, afterLogin, afterSiteCreation,
@@ -156,7 +156,7 @@ public void doError(HttpServletRequest request,HttpServletResponse response, Str
 			log.error(e.getLocalizedMessage(), e);
 		}
 		log.info("{}: {}", rb.getString(s), message);
-		String return_url = request.getParameter(BasicLTIConstants.LAUNCH_PRESENTATION_RETURN_URL);
+		String return_url = request.getParameter(LTIConstants.LAUNCH_PRESENTATION_RETURN_URL);
 		if (return_url != null && return_url.length() > 1) {
 			if (return_url.indexOf('?') > 1) {
 				return_url += "&lti_msg=" + URLEncoder.encode(rb.getString(s), "UTF-8");
@@ -214,16 +214,16 @@ public void init(ServletConfig config) throws ServletException {
 
         ApplicationContext ac = WebApplicationContextUtils.getWebApplicationContext(config.getServletContext());
 
-        // load all instance of BLTIProcessor in component mgr by type detection
-        Collection processors = ac.getParent().getBeansOfType(BLTIProcessor.class).values();
+        // load all instance of LTIProcessor in component mgr by type detection
+        Collection processors = ac.getParent().getBeansOfType(LTIProcessor.class).values();
         bltiProcessors = new ArrayList(processors);
         // sort in using getOrder() method
 
         // sort them so the execution order is determined consistenly - by getOrder()
         Collections.sort(bltiProcessors, new Comparator() {
             public int compare(Object o1, Object o2) {
-                return ((Comparable) ((BLTIProcessor) (o1)).getOrder())
-                        .compareTo(((BLTIProcessor) (o2)).getOrder());
+                return ((Comparable) ((LTIProcessor) (o1)).getOrder())
+                        .compareTo(((LTIProcessor) (o2)).getOrder());
             }
         });
 	}
@@ -240,7 +240,7 @@ protected Map getPayloadAsMap(HttpServletRequest request) {
 			payload.put(key, request.getParameter(key));
 		}
 
-		String requestURL = SakaiBLTIUtil.getOurServletPath(request);
+		String requestURL = SakaiLTIUtil.getOurServletPath(request);
 		payload.put("oauth_message", OAuthServlet.getMessage(request, requestURL));
 		payload.put("tool_id", 	request.getPathInfo());
 		return payload;
@@ -277,7 +277,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
 		// If this is a LTI request of any kind, make sure we don't have any
 		// prior payload in the session.
-		if ( BasicLTIUtil.isRequest(request) ) {
+		if ( LTIUtil.isRequest(request) ) {
 			Session sess = SessionManager.getCurrentSession();
 			sess.removeAttribute("payload");
 		}
@@ -355,7 +355,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             // Check if we are loop-backing on the same server, and already logged in as same user
             Session sess = SessionManager.getCurrentSession();
-            String serverUrl = SakaiBLTIUtil.getOurServerUrl();
+            String serverUrl = SakaiLTIUtil.getOurServerUrl();
             String ext_sakai_server = (String) payload.get("ext_sakai_server");
 
             if ( "/content.item".equals(request.getPathInfo()) && isTrustedConsumer &&
@@ -406,7 +406,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             // Construct a URL to this tool
             StringBuilder url = new StringBuilder();
-                url.append(SakaiBLTIUtil.getOurServerUrl());
+                url.append(SakaiLTIUtil.getOurServerUrl());
                 url.append(ServerConfigurationService.getString("portalPath", "/portal"));
                 url.append("/tool-reset/");
                 url.append(toolPlacementId);
@@ -417,7 +417,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             }
             //String toolLink = ServerConfigurationService.getPortalUrl()+ "/tool-reset/" + placement_id + "?panel=Main";
             // Compensate for bug in getPortalUrl()
-            //toolLink = toolLink.replace("IMS BLTI Portlet", "portal");
+            //toolLink = toolLink.replace("IMS LTI Portlet", "portal");
             response.setContentType("text/html");
             response.setStatus(HttpServletResponse.SC_FOUND);
             response.sendRedirect(url.toString());
@@ -470,7 +470,7 @@ protected void invokeProcessors(Map payload, boolean trustedConsumer,
                                     ProcessingState processingState, User user,
                                     Site site, String toolPlacementId) throws LTIException{
         if (!bltiProcessors.isEmpty()) {
-            for (BLTIProcessor processor : bltiProcessors) {
+            for (LTIProcessor processor : bltiProcessors) {
                 switch (processingState) {
 
                     case beforeValidation:
@@ -504,39 +504,39 @@ protected void invokeProcessors(Map payload, boolean trustedConsumer,
     protected void validate(Map payload, boolean isTrustedConsumer) throws LTIException
     {
           //check parameters
-          String lti_message_type = (String) payload.get(BasicLTIConstants.LTI_MESSAGE_TYPE);
-          String lti_version = (String) payload.get(BasicLTIConstants.LTI_VERSION);
+          String lti_message_type = (String) payload.get(LTIConstants.LTI_MESSAGE_TYPE);
+          String lti_version = (String) payload.get(LTIConstants.LTI_VERSION);
           String oauth_consumer_key = (String) payload.get("oauth_consumer_key");
-          String resource_link_id = (String) payload.get(BasicLTIConstants.RESOURCE_LINK_ID);
-          String user_id = (String) payload.get(BasicLTIConstants.USER_ID);
-          String context_id = (String) payload.get(BasicLTIConstants.CONTEXT_ID);
+          String resource_link_id = (String) payload.get(LTIConstants.RESOURCE_LINK_ID);
+          String user_id = (String) payload.get(LTIConstants.USER_ID);
+          String context_id = (String) payload.get(LTIConstants.CONTEXT_ID);
 
 
           boolean launch = true;
-          if( BasicLTIUtil.equals(lti_message_type, "basic-lti-launch-request") ) {
+          if( LTIUtil.equals(lti_message_type, "basic-lti-launch-request") ) {
               launch = true;
-          } else if ( BasicLTIUtil.equals(lti_message_type, "ContentItemSelectionRequest") ) {
+          } else if ( LTIUtil.equals(lti_message_type, "ContentItemSelectionRequest") ) {
               launch = false;
           } else {
               throw new LTIException("launch.invalid", "lti_message_type="+lti_message_type, null);
           }
 
-          if(!BasicLTIUtil.equals(lti_version, "LTI-1p0")) {
+          if(!LTIUtil.equals(lti_version, "LTI-1p0")) {
               throw new LTIException( "launch.invalid", "lti_version="+lti_version, null);
 
           }
 
-          if(BasicLTIUtil.isBlank(oauth_consumer_key)) {
+          if(LTIUtil.isBlank(oauth_consumer_key)) {
               throw new LTIException( "launch.missing", "oauth_consumer_key", null);
 
           }
 
-          if(launch && BasicLTIUtil.isBlank(resource_link_id)) {
+          if(launch && LTIUtil.isBlank(resource_link_id)) {
               throw new LTIException( "launch.missing", "resource_link_id", null);
 
           }
 
-          if(BasicLTIUtil.isBlank(user_id)) {
+          if(LTIUtil.isBlank(user_id)) {
               throw new LTIException( "launch.missing", "user_id", null);
 
           }
@@ -577,8 +577,8 @@ protected void validate(Map payload, boolean isTrustedConsumer) throws LTIExcept
           // in place of using the user_id parameter
           // WE still need that parameter though, so translate it from the given eid.
           boolean useProvidedEid = false;
-          String ext_sakai_provider_eid = (String) payload.get(BasicLTIConstants.EXT_SAKAI_PROVIDER_EID);
-          if(BasicLTIUtil.isNotBlank(ext_sakai_provider_eid)){
+          String ext_sakai_provider_eid = (String) payload.get(LTIConstants.EXT_SAKAI_PROVIDER_EID);
+          if(LTIUtil.isNotBlank(ext_sakai_provider_eid)){
               useProvidedEid = true;
               try {
                   user_id = UserDirectoryService.getUserId(ext_sakai_provider_eid);
@@ -595,19 +595,19 @@ protected void validate(Map payload, boolean isTrustedConsumer) throws LTIExcept
 
           // Contextualize the context_id with the OAuth consumer key
           // Also use the resource_link_id for the context_id if we did not get a context_id
-          // BLTI-31: if trusted, context_id is required and use the param without modification
-          if(BasicLTIUtil.isBlank(context_id)) {
+          // LTI-31: if trusted, context_id is required and use the param without modification
+          if(LTIUtil.isBlank(context_id)) {
               if(isTrustedConsumer) {
                   throw new LTIException( "launch.missing",context_id, null);
               } else {
                   context_id = "res:" + resource_link_id;
-                  payload.put(BasicLTIConstants.CONTEXT_ID, context_id);
+                  payload.put(LTIConstants.CONTEXT_ID, context_id);
               }
           }
 
           // Check if context_id is simply a ~. If so, get the id of that user's My Workspace site
           // and use that to construct the full context_id
-          if(BasicLTIUtil.equals(context_id, "~")){
+          if(LTIUtil.equals(context_id, "~")){
               if(useProvidedEid) {
                   String userSiteId = null;
                   try {
@@ -618,7 +618,7 @@ protected void validate(Map payload, boolean isTrustedConsumer) throws LTIExcept
                       throw new LTIException( "launch.user.site.unknown", "user_id="+user_id, e);
                   }
                   context_id = userSiteId;
-                  payload.put(BasicLTIConstants.CONTEXT_ID, context_id);
+                  payload.put(LTIConstants.CONTEXT_ID, context_id);
               }
           }
 
@@ -701,7 +701,7 @@ private String addOrCreateTool(Map payload, boolean trustedConsumer, User user,
         // If tool not in site, and we are a trusted consumer, error
         // Otherwise, add tool to the site
         ToolConfiguration toolConfig = null;
-        if(BasicLTIUtil.isBlank(toolPlacementId)) {
+        if(LTIUtil.isBlank(toolPlacementId)) {
             try {
                 SitePage sitePageEdit = null;
                 sitePageEdit = site.addPage();
@@ -712,7 +712,7 @@ private String addOrCreateTool(Map payload, boolean trustedConsumer, User user,
                 toolConfig.setTitle(tool_id);
 
                 Properties propsedit = toolConfig.getPlacementConfig();
-                propsedit.setProperty(BASICLTI_RESOURCE_LINK,  (String) payload.get(BasicLTIConstants.RESOURCE_LINK_ID));
+                propsedit.setProperty(LTI_RESOURCE_LINK,  (String) payload.get(LTIConstants.RESOURCE_LINK_ID));
                 pushAdvisor();
                 try {
                     SiteService.save(site);
@@ -745,7 +745,7 @@ private String addOrCreateTool(Map payload, boolean trustedConsumer, User user,
 
     protected Site findOrCreateSite(Map payload, boolean trustedConsumer) throws LTIException {
 
-        String context_id = (String) payload.get(BasicLTIConstants.CONTEXT_ID);
+        String context_id = (String) payload.get(LTIConstants.CONTEXT_ID);
         String oauth_consumer_key = (String) payload.get("oauth_consumer_key");
         String siteId = null;
 
@@ -758,8 +758,8 @@ protected Site findOrCreateSite(Map payload, boolean trustedConsumer) throws LTI
             log.debug("siteId={}", siteId);
         }
 
-        final String context_title_orig = (String) payload.get(BasicLTIConstants.CONTEXT_TITLE);
-        final String context_label = (String) payload.get(BasicLTIConstants.CONTEXT_LABEL);
+        final String context_title_orig = (String) payload.get(LTIConstants.CONTEXT_TITLE);
+        final String context_label = (String) payload.get(LTIConstants.CONTEXT_LABEL);
 
         // Site title is editable; cannot but null/empty after HTML stripping, and cannot exceed max length
         String context_title = ComponentManager.get(FormattedText.class).stripHtmlFromText(context_title_orig, true, true);
@@ -809,7 +809,7 @@ protected Site findOrCreateSite(Map payload, boolean trustedConsumer) throws LTI
             try {
                 String sakai_type = "project";
 
-                // BLTI-154. If an autocreation site template has been specced in sakai.properties, use it.
+                // LTI-154. If an autocreation site template has been specced in sakai.properties, use it.
                 String autoSiteTemplateId = ServerConfigurationService.getString("lti.provider.autositetemplate", null);
 
                 boolean templateSiteExists = SiteService.siteExists(autoSiteTemplateId);
@@ -819,15 +819,15 @@ protected Site findOrCreateSite(Map payload, boolean trustedConsumer) throws LTI
                 }
 
                 if(autoSiteTemplateId == null || !templateSiteExists) {
-                    //BLTI-151 If the new site type has been specified in sakai.properties, use it.
+                    //LTI-151 If the new site type has been specified in sakai.properties, use it.
                     sakai_type = ServerConfigurationService.getString("lti.provider.newsitetype", null);
-                    if(BasicLTIUtil.isBlank(sakai_type)) {
+                    if(LTIUtil.isBlank(sakai_type)) {
                         // It wasn't specced in the props. Test for the ims course context type.
-                        final String context_type = (String) payload.get(BasicLTIConstants.CONTEXT_TYPE);
-                        if (BasicLTIUtil.equalsIgnoreCase(context_type, "course")) {
+                        final String context_type = (String) payload.get(LTIConstants.CONTEXT_TYPE);
+                        if (LTIUtil.equalsIgnoreCase(context_type, "course")) {
                             sakai_type = "course";
                         } else {
-                            sakai_type = BasicLTIConstants.NEW_SITE_TYPE;
+                            sakai_type = LTIConstants.NEW_SITE_TYPE;
                         }
                     }
                     site = SiteService.addSite(siteId, sakai_type);
@@ -837,10 +837,10 @@ protected Site findOrCreateSite(Map payload, boolean trustedConsumer) throws LTI
                		site = SiteService.addSite(siteId, autoSiteTemplate);
                 }
 
-                if (BasicLTIUtil.isNotBlank(context_title)) {
+                if (LTIUtil.isNotBlank(context_title)) {
                     site.setTitle(context_title);
                 }
-                if (BasicLTIUtil.isNotBlank(context_label)) {
+                if (LTIUtil.isNotBlank(context_label)) {
                     site.setShortDescription(context_label);
                 }
                 site.setJoinable(false);
@@ -876,12 +876,12 @@ private final void updateSiteDetailsIfChanged(Site site, String context_title, S
 
         boolean changed = false;
 
-        if (BasicLTIUtil.isNotBlank(context_title) && !context_title.equals(site.getTitle())) {
+        if (LTIUtil.isNotBlank(context_title) && !context_title.equals(site.getTitle())) {
             site.setTitle(context_title);
             changed = true;
         }
 
-        if (BasicLTIUtil.isNotBlank(context_label) && !context_label.equals(site.getShortDescription())) {
+        if (LTIUtil.isNotBlank(context_label) && !context_label.equals(site.getShortDescription())) {
             site.setShortDescription(context_label);
             changed = true;
         }
@@ -941,14 +941,14 @@ private void syncSiteMembershipsOnceThenSchedule(Map payload, Site site, boolean
 
         log.debug("synchSiteMembershipsOnceThenSchedule");
 
-        if (!ServerConfigurationService.getBoolean(SakaiBLTIUtil.INCOMING_ROSTER_ENABLED, false)) {
+        if (!ServerConfigurationService.getBoolean(SakaiLTIUtil.INCOMING_ROSTER_ENABLED, false)) {
             log.info("LTI Memberships synchronization disabled.");
             return;
         }
 
         final String membershipsUrl = (String) payload.get("ext_ims_lis_memberships_url");
 
-        if (BasicLTIUtil.isBlank(membershipsUrl)) {
+        if (LTIUtil.isBlank(membershipsUrl)) {
             log.info("LTI Memberships extension is not supported.");
             return;
         }
@@ -957,7 +957,7 @@ private void syncSiteMembershipsOnceThenSchedule(Map payload, Site site, boolean
 
         final String membershipsId = (String) payload.get("ext_ims_lis_memberships_id");
 
-        if (BasicLTIUtil.isBlank(membershipsId)) {
+        if (LTIUtil.isBlank(membershipsId)) {
             log.info("No memberships id supplied. Memberships will NOT be synchronized.");
             return;
         }
@@ -981,8 +981,8 @@ private void syncSiteMembershipsOnceThenSchedule(Map payload, Site site, boolean
 
         String lms = (String) payload.get("ext_lms");
         final String callbackType
-            = (BasicLTIUtil.isNotBlank(lms) && lms.equals("moodle-2"))
-                ? "ext-moodle-2" : (String) payload.get(BasicLTIConstants.LTI_VERSION);
+            = (LTIUtil.isNotBlank(lms) && lms.equals("moodle-2"))
+                ? "ext-moodle-2" : (String) payload.get(LTIConstants.LTI_VERSION);
 
         (new Thread(new Runnable() {
 
@@ -1002,7 +1002,7 @@ public void run() {
                         log.debug("Memberships sync finished. It took {} seconds.", ((now - then)/1000));
                     }
                 }
-            }, "org.sakaiproject.blti.ProviderServlet.MembershipsSync")).start();
+            }, "org.sakaiproject.lti.ProviderServlet.MembershipsSync")).start();
 
         ltiService.insertMembershipsJob(siteId, membershipsId, membershipsUrl, oauth_consumer_key, callbackType);
     }
@@ -1051,8 +1051,8 @@ private void handleContentItem(HttpServletRequest request, HttpServletResponse r
 			// Set up the return
 			Map<String, String> ltiMap = new HashMap<String, String> ();
 			Map<String, String> extra = new HashMap<String, String> ();
-			ltiMap.put(BasicLTIConstants.LTI_MESSAGE_TYPE, BasicLTIConstants.LTI_MESSAGE_TYPE_CONTENTITEMSELECTION);
-			ltiMap.put(BasicLTIConstants.LTI_VERSION, BasicLTIConstants.LTI_VERSION_1);
+			ltiMap.put(LTIConstants.LTI_MESSAGE_TYPE, LTIConstants.LTI_MESSAGE_TYPE_CONTENTITEMSELECTION);
+			ltiMap.put(LTIConstants.LTI_VERSION, LTIConstants.LTI_VERSION_1);
 			ltiMap.put("content_items", content_items);
 			String data = (String) payload.get("data");
 			if ( data != null ) ltiMap.put("data", data);
@@ -1063,7 +1063,7 @@ private void handleContentItem(HttpServletRequest request, HttpServletResponse r
 			String launchtext = rb.getString("content_item.install.button");
 			String back_to_store = rb.getString("content_item.back.to.store");
 			extra.put("button_html","<input type=\"submit\" value=\""+back_to_store+"\"onclick=\"location.href='content.item'; return false;\">");
-			String launch_html = BasicLTIUtil.postLaunchHTML(ltiMap, content_item_return_url, launchtext, autosubmit, dodebug, extra);
+			String launch_html = LTIUtil.postLaunchHTML(ltiMap, content_item_return_url, launchtext, autosubmit, dodebug, extra);
 
 			request.setAttribute("back_to_store", rb.getString("content_item.back.to.store"));
 			request.setAttribute("install",tool_id);
@@ -1099,7 +1099,7 @@ private void handleCanvasConfig(HttpServletRequest request, HttpServletResponse
 		request.setAttribute("icon",icon);
 
 		try {
-			String serverUrl = SakaiBLTIUtil.getOurServerUrl();
+			String serverUrl = SakaiLTIUtil.getOurServerUrl();
 			URL netUrl = new URL(serverUrl);
 			String host = netUrl.getHost();
 			String domain = ServerConfigurationService.getString("canvas.config.domain", host);
diff --git a/basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java b/lti/lti-portlet/src/java/org/sakaiproject/portlets/IMSLTIPortlet.java
similarity index 91%
rename from basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java
rename to lti/lti-portlet/src/java/org/sakaiproject/portlets/IMSLTIPortlet.java
index 156d3d39e957..4347cefacdfc 100644
--- a/basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java
+++ b/lti/lti-portlet/src/java/org/sakaiproject/portlets/IMSLTIPortlet.java
@@ -19,14 +19,14 @@
 
 package org.sakaiproject.portlets;
 
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_ALLOWROSTER;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_ASSIGNMENT;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_KEY;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_ON;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_PLACEMENTSECRET;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_RELEASEEMAIL;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_RELEASENAME;
-import static org.sakaiproject.basiclti.util.SakaiBLTIUtil.BASICLTI_PORTLET_TOOLTITLE;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_ALLOWROSTER;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_ASSIGNMENT;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_KEY;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_ON;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_PLACEMENTSECRET;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_RELEASEEMAIL;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_RELEASENAME;
+import static org.sakaiproject.lti.util.SakaiLTIUtil.LTI_PORTLET_TOOLTITLE;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -57,9 +57,9 @@
 import javax.portlet.RenderResponse;
 import javax.servlet.ServletRequest;
 
-import org.sakaiproject.basiclti.LocalEventTrackingService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.sakaiproject.basiclti.util.SimpleEncryption;
+import org.sakaiproject.lti.LocalEventTrackingService;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
+import org.sakaiproject.lti.util.SimpleEncryption;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.event.api.Event;
@@ -80,16 +80,16 @@
 import org.sakaiproject.tool.cover.ToolManager;
 import org.sakaiproject.util.ResourceLoader;
 import org.sakaiproject.util.api.FormattedText;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * a simple IMSBLTIPortlet Portlet
+ * a simple IMSLTIPortlet Portlet
  */
 @SuppressWarnings("deprecation")
 @Slf4j
-public class IMSBLTIPortlet extends GenericPortlet {
+public class IMSLTIPortlet extends GenericPortlet {
 
 	private static ResourceLoader rb = new ResourceLoader("basiclti");
 
@@ -97,7 +97,7 @@ public class IMSBLTIPortlet extends GenericPortlet {
 
 	private ArrayList<String> fieldList = new ArrayList<String>();
 
-	public static final String EVENT_BASICLTI_CONFIG = "basiclti.config";
+	public static final String EVENT_LTI_CONFIG = "basiclti.config";
 
 	private static String LEAVE_SECRET_ALONE = "__dont_change_secret__";
 
@@ -117,19 +117,19 @@ public void init(PortletConfig config) throws PortletException {
 		// Populate the list of fields
 		fieldList.add("launch");
 		fieldList.add("secret");
-		fieldList.add(BASICLTI_PORTLET_KEY);
+		fieldList.add(LTI_PORTLET_KEY);
 		fieldList.add("xml");
 		fieldList.add("frameheight");
 		fieldList.add("toolorder");
 		fieldList.add("debug");
 		fieldList.add("description");
-		fieldList.add(BASICLTI_PORTLET_TOOLTITLE);
+		fieldList.add(LTI_PORTLET_TOOLTITLE);
 		fieldList.add("custom");
-		fieldList.add(BASICLTI_PORTLET_RELEASENAME);
-		fieldList.add(BASICLTI_PORTLET_RELEASEEMAIL);
-		fieldList.add(BASICLTI_PORTLET_ASSIGNMENT);
+		fieldList.add(LTI_PORTLET_RELEASENAME);
+		fieldList.add(LTI_PORTLET_RELEASEEMAIL);
+		fieldList.add(LTI_PORTLET_ASSIGNMENT);
 		fieldList.add("newpage");
-		fieldList.add(BASICLTI_PORTLET_ALLOWROSTER);
+		fieldList.add(LTI_PORTLET_ALLOWROSTER);
 		fieldList.add("splash");
 		fieldList.add("fa_icon");
 	}
@@ -165,31 +165,31 @@ public void doView(RenderRequest request, RenderResponse response)
 
 			// Get the properties
 			Properties sakaiProperties = getSakaiProperties();
-			String placementSecret = getSakaiProperty(sakaiProperties,"imsti."+BASICLTI_PORTLET_PLACEMENTSECRET);
-			String allowRoster = getSakaiProperty(sakaiProperties,"imsti."+BASICLTI_PORTLET_ALLOWROSTER);
-			String assignment = getSakaiProperty(sakaiProperties,"imsti."+BASICLTI_PORTLET_ASSIGNMENT);
+			String placementSecret = getSakaiProperty(sakaiProperties,"imsti."+LTI_PORTLET_PLACEMENTSECRET);
+			String allowRoster = getSakaiProperty(sakaiProperties,"imsti."+LTI_PORTLET_ALLOWROSTER);
+			String assignment = getSakaiProperty(sakaiProperties,"imsti."+LTI_PORTLET_ASSIGNMENT);
 			String launch = getSakaiProperty(sakaiProperties,"imsti.launch");
 
 			if ( placementSecret == null &&
-			   ( SakaiBLTIUtil.outcomesEnabled() ||
-				 BASICLTI_PORTLET_ON.equals(allowRoster) ) ) {
+			   ( SakaiLTIUtil.outcomesEnabled() ||
+				 LTI_PORTLET_ON.equals(allowRoster) ) ) {
 				String uuid = UUID.randomUUID().toString();
 				Date date = new Date();
 				SimpleDateFormat sdf = new SimpleDateFormat(ISO_8601_FORMAT);
 				String date_secret = sdf.format(date);
-				placement.getPlacementConfig().setProperty("imsti."+BASICLTI_PORTLET_PLACEMENTSECRET, uuid);
+				placement.getPlacementConfig().setProperty("imsti."+LTI_PORTLET_PLACEMENTSECRET, uuid);
 				placement.getPlacementConfig().setProperty("imsti.placementsecretdate", date_secret);
 				placement.save();
 			}
 
 			// Check to see if our launch will be successful
-			String[] retval = SakaiBLTIUtil.postLaunchHTML(placement.getId(), rb);
+			String[] retval = SakaiLTIUtil.postLaunchHTML(placement.getId(), rb);
 			if ( retval.length > 1 ) {
 				String iframeUrl = "/access/lti/site/"+context+"/"+placement.getId();
 				String frameHeight =  getCorrectProperty(request, "frameheight", null);
 				log.debug("fh={}", frameHeight);
 				String newPage =  getCorrectProperty(request, "newpage", null);
-				String serverUrl = SakaiBLTIUtil.getOurServerUrl();
+				String serverUrl = SakaiLTIUtil.getOurServerUrl();
 				boolean forcePopup = false;
 				if ( request.isSecure() || ( serverUrl != null && serverUrl.startsWith("https://") ) ) {
 					if ( launch != null && launch.startsWith("http://") ) {
@@ -198,8 +198,8 @@ public void doView(RenderRequest request, RenderResponse response)
 				}
 
 				// Change "newpage" if forcePopup so the portal will do our pop up next time
-				if ( forcePopup && ! BASICLTI_PORTLET_ON.equals(newPage) ) {
-					placement.getPlacementConfig().setProperty("imsti.newpage",BASICLTI_PORTLET_ON);
+				if ( forcePopup && ! LTI_PORTLET_ON.equals(newPage) ) {
+					placement.getPlacementConfig().setProperty("imsti.newpage",LTI_PORTLET_ON);
 					placement.save();
 				}
 
@@ -210,7 +210,7 @@ public void doView(RenderRequest request, RenderResponse response)
 				session.setAttribute("sakai:maximized-url",iframeUrl);
 				log.debug("Setting sakai:maximized-url={}", iframeUrl);
 
-				if ( BASICLTI_PORTLET_ON.equals(newPage) || forcePopup ) {
+				if ( LTI_PORTLET_ON.equals(newPage) || forcePopup ) {
 					String windowOpen = "window.open('"+iframeUrl+"','LTI');"; 			
 					String siteName = ServerConfigurationService.getString(SITE_NAME, SAKAI);
 					title = title!=null ? title : rb.getString("tool.name", "your tool");
@@ -219,7 +219,7 @@ public void doView(RenderRequest request, RenderResponse response)
 					text.append("</p>\n");
 					text.append("<input type=\"submit\" onclick=\""+windowOpen+"\" target=\"LTI\" value=\"Launch " + title + "\"/>");
 				} else {
-					if ( BASICLTI_PORTLET_ON.equals(maximize) ) {
+					if ( LTI_PORTLET_ON.equals(maximize) ) {
 						text.append("<script type=\"text/javascript\" language=\"JavaScript\">\n");
 						text.append("try { portalMaximizeTool(); } catch (err) { }\n");
 						text.append("</script>\n");
@@ -336,11 +336,11 @@ public void prepareEdit(RenderRequest request)
 
 		request.setAttribute("imsti.oldvalues", oldValues);
 
-		String allowRoster = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED, SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED_DEFAULT);
+		String allowRoster = ServerConfigurationService.getString(SakaiLTIUtil.LTI_ROSTER_ENABLED, SakaiLTIUtil.LTI_ROSTER_ENABLED_DEFAULT);
 		request.setAttribute("allowRoster", new Boolean("true".equals(allowRoster)));
 
 		// For outcomes we check for tools in the site before offering the options
-		String allowOutcomes = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT);
+		String allowOutcomes = ServerConfigurationService.getString(SakaiLTIUtil.LTI_OUTCOMES_ENABLED, SakaiLTIUtil.LTI_OUTCOMES_ENABLED_DEFAULT);
 
 		boolean foundLessons = false;
 		boolean foundGradebook = false;
@@ -614,7 +614,7 @@ public void processActionSave(String action,ActionRequest request, ActionRespons
 
 			String launch_url = imsTIUrl;
 			if ( imsTIXml != null ) {
-				launch_url = BasicLTIUtil.validateDescriptor(imsTIXml);
+				launch_url = LTIUtil.validateDescriptor(imsTIXml);
 				if ( launch_url == null ) {
 					setErrorMessage(request, rb.getString("error.xml.input"));
 					return;
@@ -643,9 +643,9 @@ public void processActionSave(String action,ActionRequest request, ActionRespons
 			// Make Sure the Assignment is a legal one
 			String assignment = getFormParameter(request,sakaiProperties,"assignment");
 			String newAssignment = getFormParameter(request,sakaiProperties,"newassignment");
-			String oldPlacementSecret = getSakaiProperty(sakaiProperties,"imsti."+BASICLTI_PORTLET_PLACEMENTSECRET);
-			String allowOutcomes = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT);
-			String allowRoster = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED, SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED_DEFAULT);
+			String oldPlacementSecret = getSakaiProperty(sakaiProperties,"imsti."+LTI_PORTLET_PLACEMENTSECRET);
+			String allowOutcomes = ServerConfigurationService.getString(SakaiLTIUtil.LTI_OUTCOMES_ENABLED, SakaiLTIUtil.LTI_OUTCOMES_ENABLED_DEFAULT);
+			String allowRoster = ServerConfigurationService.getString(SakaiLTIUtil.LTI_ROSTER_ENABLED, SakaiLTIUtil.LTI_ROSTER_ENABLED_DEFAULT);
 			if ( "true".equals(allowOutcomes) && newAssignment != null && newAssignment.trim().length() > 1 ) {
 				if ( addGradeBookItem(request, newAssignment) ) {
 					log.debug("Success!");
@@ -662,7 +662,7 @@ public void processActionSave(String action,ActionRequest request, ActionRespons
 					Date date = new Date();
 					SimpleDateFormat sdf = new SimpleDateFormat(ISO_8601_FORMAT);
 					String date_secret = sdf.format(date);
-					prefs.setValue("sakai:imsti."+BASICLTI_PORTLET_PLACEMENTSECRET, uuid);
+					prefs.setValue("sakai:imsti."+LTI_PORTLET_PLACEMENTSECRET, uuid);
 					prefs.setValue("sakai:imsti.placementsecretdate", date_secret);
 					log.debug("placementsecret set to={} data={}", uuid, date_secret);
 					changed = true;
@@ -742,12 +742,12 @@ public void processActionSave(String action,ActionRequest request, ActionRespons
 
 				if ( "secret".equals(element) ) {
 					if ( LEAVE_SECRET_ALONE.equals(formParm) ) continue;
-					String key = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_ENCRYPTION_KEY, null);
+					String key = ServerConfigurationService.getString(SakaiLTIUtil.LTI_ENCRYPTION_KEY, null);
 					if (key != null) {
 						try {
 							if ( formParm != null && formParm.trim().length() > 0 ) {
 									formParm = SimpleEncryption.encrypt(key, formParm);
-									// BLTI-195 convert old-style encrypted secrets
+									// LTI-195 convert old-style encrypted secrets
 									prefs.reset("sakai:imsti.encryptedsecret");
 							}
 						} catch (RuntimeException re) {
@@ -783,9 +783,9 @@ public void processActionSave(String action,ActionRequest request, ActionRespons
 			// track event and store
 			if ( changed ) {
 				// 2.6 Event Tracking
-				Event event = LocalEventTrackingService.newEvent(EVENT_BASICLTI_CONFIG, launch_url, context, true, NotificationService.NOTI_OPTIONAL);
+				Event event = LocalEventTrackingService.newEvent(EVENT_LTI_CONFIG, launch_url, context, true, NotificationService.NOTI_OPTIONAL);
 				// 2.5 Event Tracking
-				// Event event = EventTrackingService.newEvent(EVENT_BASICLTI_CONFIG, launch_url, true);
+				// Event event = EventTrackingService.newEvent(EVENT_LTI_CONFIG, launch_url, true);
 				LocalEventTrackingService.post(event);
 				prefs.store();
 			}
diff --git a/basiclti/basiclti-portlet/src/webapp/WEB-INF/applicationContext.xml b/lti/lti-portlet/src/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/WEB-INF/applicationContext.xml
rename to lti/lti-portlet/src/webapp/WEB-INF/applicationContext.xml
diff --git a/basiclti/basiclti-portlet/src/webapp/WEB-INF/portlet.xml b/lti/lti-portlet/src/webapp/WEB-INF/portlet.xml
similarity index 93%
rename from basiclti/basiclti-portlet/src/webapp/WEB-INF/portlet.xml
rename to lti/lti-portlet/src/webapp/WEB-INF/portlet.xml
index 53722babae0b..a36ff80a5a16 100644
--- a/basiclti/basiclti-portlet/src/webapp/WEB-INF/portlet.xml
+++ b/lti/lti-portlet/src/webapp/WEB-INF/portlet.xml
@@ -5,9 +5,9 @@
         version="1.0">
 
     <portlet>
-        <portlet-name>IMSBLTIPortlet</portlet-name>
+        <portlet-name>IMSLTIPortlet</portlet-name>
         <display-name xml:lang="en">IMS Learning Tool Interoperability</display-name>
-        <portlet-class>org.sakaiproject.portlets.IMSBLTIPortlet</portlet-class>
+        <portlet-class>org.sakaiproject.portlets.IMSLTIPortlet</portlet-class>
 
        <init-param>
             <name>sakai.test.init.parm</name>
diff --git a/basiclti/basiclti-portlet/src/webapp/WEB-INF/sakai/IMSBLTIPortlet.xml b/lti/lti-portlet/src/webapp/WEB-INF/sakai/IMSLTIPortlet.xml
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/WEB-INF/sakai/IMSBLTIPortlet.xml
rename to lti/lti-portlet/src/webapp/WEB-INF/sakai/IMSLTIPortlet.xml
diff --git a/basiclti/basiclti-portlet/src/webapp/WEB-INF/web.xml b/lti/lti-portlet/src/webapp/WEB-INF/web.xml
similarity index 78%
rename from basiclti/basiclti-portlet/src/webapp/WEB-INF/web.xml
rename to lti/lti-portlet/src/webapp/WEB-INF/web.xml
index 86f895a1dc47..f76c589f0878 100644
--- a/basiclti/basiclti-portlet/src/webapp/WEB-INF/web.xml
+++ b/lti/lti-portlet/src/webapp/WEB-INF/web.xml
@@ -2,7 +2,7 @@
 <web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-  <display-name>IMS BLTI Portlet</display-name>
+  <display-name>IMS LTI Portlet</display-name>
 
   <filter>
     <filter-name>sakai.request</filter-name>
@@ -18,23 +18,23 @@
   </filter-mapping>
 
   <servlet>
-    <servlet-name>IMSBLTIPortlet</servlet-name>
+    <servlet-name>IMSLTIPortlet</servlet-name>
     <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
     <init-param>
     <param-name>portlet-name</param-name>
-    <param-value>IMSBLTIPortlet</param-value>
+    <param-value>IMSLTIPortlet</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
   <servlet>
     <servlet-name>ProviderServlet</servlet-name>
-    <servlet-class>org.sakaiproject.blti.ProviderServlet</servlet-class>
+    <servlet-class>org.sakaiproject.lti.ProviderServlet</servlet-class>
   </servlet>
 
   <servlet-mapping>
-      <servlet-name>IMSBLTIPortlet</servlet-name>
-      <url-pattern>/PlutoInvoker/IMSBLTIPortlet</url-pattern>
+      <servlet-name>IMSLTIPortlet</servlet-name>
+      <url-pattern>/PlutoInvoker/IMSLTIPortlet</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/basiclti/basiclti-portlet/src/webapp/canvas-config.jsp b/lti/lti-portlet/src/webapp/canvas-config.jsp
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/canvas-config.jsp
rename to lti/lti-portlet/src/webapp/canvas-config.jsp
diff --git a/basiclti/basiclti-portlet/src/webapp/contentitem.jsp b/lti/lti-portlet/src/webapp/contentitem.jsp
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/contentitem.jsp
rename to lti/lti-portlet/src/webapp/contentitem.jsp
diff --git a/basiclti/basiclti-portlet/src/webapp/descriptor.txt b/lti/lti-portlet/src/webapp/descriptor.txt
similarity index 89%
rename from basiclti/basiclti-portlet/src/webapp/descriptor.txt
rename to lti/lti-portlet/src/webapp/descriptor.txt
index d34f856d3ec2..8ea23dd19410 100644
--- a/basiclti/basiclti-portlet/src/webapp/descriptor.txt
+++ b/lti/lti-portlet/src/webapp/descriptor.txt
@@ -6,7 +6,7 @@
   <custom>
     <parameter key="isbn">9780596800697</parameter>
   </custom>
-  <launch_url>http://developers.imsglobal.org/BLTI/tool.php</launch_url>
+  <launch_url>http://developers.imsglobal.org/LTI/tool.php</launch_url>
   <vendor>
     <code>www.imsglobal.org</code>
     <name>IMS Global Learning Consortium</name>
diff --git a/basiclti/basiclti-portlet/src/webapp/edit.jsp b/lti/lti-portlet/src/webapp/edit.jsp
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/edit.jsp
rename to lti/lti-portlet/src/webapp/edit.jsp
diff --git a/basiclti/basiclti-portlet/src/webapp/editreset.jsp b/lti/lti-portlet/src/webapp/editreset.jsp
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/editreset.jsp
rename to lti/lti-portlet/src/webapp/editreset.jsp
diff --git a/basiclti/basiclti-portlet/src/webapp/images/loader.gif b/lti/lti-portlet/src/webapp/images/loader.gif
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/images/loader.gif
rename to lti/lti-portlet/src/webapp/images/loader.gif
diff --git a/basiclti/basiclti-portlet/src/webapp/static/waterfall-light.js b/lti/lti-portlet/src/webapp/static/waterfall-light.js
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/static/waterfall-light.js
rename to lti/lti-portlet/src/webapp/static/waterfall-light.js
diff --git a/basiclti/basiclti-portlet/src/webapp/whatisthis.htm b/lti/lti-portlet/src/webapp/whatisthis.htm
similarity index 100%
rename from basiclti/basiclti-portlet/src/webapp/whatisthis.htm
rename to lti/lti-portlet/src/webapp/whatisthis.htm
diff --git a/basiclti/basiclti-tool/pom.xml b/lti/lti-tool/pom.xml
similarity index 88%
rename from basiclti/basiclti-tool/pom.xml
rename to lti/lti-tool/pom.xml
index 98f5219d8069..e4cb89da6afb 100644
--- a/basiclti/basiclti-tool/pom.xml
+++ b/lti/lti-tool/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
     
-    <name>LTI Admin Tool (basiclti-tool)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti-admin-tool</artifactId>
+    <name>LTI Admin Tool (lti-tool)</name>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti-admin-tool</artifactId>
     <packaging>war</packaging>
     
     <dependencies>
@@ -19,15 +19,15 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events.properties b/lti/lti-tool/src/bundle/basiclti-events.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events.properties
rename to lti/lti-tool/src/bundle/basiclti-events.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_ar.properties b/lti/lti-tool/src/bundle/basiclti-events_ar.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_ar.properties
rename to lti/lti-tool/src/bundle/basiclti-events_ar.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_bg.properties b/lti/lti-tool/src/bundle/basiclti-events_bg.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_bg.properties
rename to lti/lti-tool/src/bundle/basiclti-events_bg.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_ca.properties b/lti/lti-tool/src/bundle/basiclti-events_ca.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_ca.properties
rename to lti/lti-tool/src/bundle/basiclti-events_ca.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_de_DE.properties b/lti/lti-tool/src/bundle/basiclti-events_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_de_DE.properties
rename to lti/lti-tool/src/bundle/basiclti-events_de_DE.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_es.properties b/lti/lti-tool/src/bundle/basiclti-events_es.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_es.properties
rename to lti/lti-tool/src/bundle/basiclti-events_es.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_eu.properties b/lti/lti-tool/src/bundle/basiclti-events_eu.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_eu.properties
rename to lti/lti-tool/src/bundle/basiclti-events_eu.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_fr_FR.properties b/lti/lti-tool/src/bundle/basiclti-events_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_fr_FR.properties
rename to lti/lti-tool/src/bundle/basiclti-events_fr_FR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_hi_IN.properties b/lti/lti-tool/src/bundle/basiclti-events_hi_IN.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_hi_IN.properties
rename to lti/lti-tool/src/bundle/basiclti-events_hi_IN.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_ja.properties b/lti/lti-tool/src/bundle/basiclti-events_ja.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_ja.properties
rename to lti/lti-tool/src/bundle/basiclti-events_ja.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_mn.properties b/lti/lti-tool/src/bundle/basiclti-events_mn.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_mn.properties
rename to lti/lti-tool/src/bundle/basiclti-events_mn.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_pt_BR.properties b/lti/lti-tool/src/bundle/basiclti-events_pt_BR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_pt_BR.properties
rename to lti/lti-tool/src/bundle/basiclti-events_pt_BR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_ro_RO.properties b/lti/lti-tool/src/bundle/basiclti-events_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_ro_RO.properties
rename to lti/lti-tool/src/bundle/basiclti-events_ro_RO.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_sr.properties b/lti/lti-tool/src/bundle/basiclti-events_sr.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_sr.properties
rename to lti/lti-tool/src/bundle/basiclti-events_sr.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_tr_TR.properties b/lti/lti-tool/src/bundle/basiclti-events_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_tr_TR.properties
rename to lti/lti-tool/src/bundle/basiclti-events_tr_TR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/basiclti-events_zh_CN.properties b/lti/lti-tool/src/bundle/basiclti-events_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/basiclti-events_zh_CN.properties
rename to lti/lti-tool/src/bundle/basiclti-events_zh_CN.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool.properties b/lti/lti-tool/src/bundle/ltitool.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool.properties
rename to lti/lti-tool/src/bundle/ltitool.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_ar.properties b/lti/lti-tool/src/bundle/ltitool_ar.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_ar.properties
rename to lti/lti-tool/src/bundle/ltitool_ar.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_bg.properties b/lti/lti-tool/src/bundle/ltitool_bg.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_bg.properties
rename to lti/lti-tool/src/bundle/ltitool_bg.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_ca.properties b/lti/lti-tool/src/bundle/ltitool_ca.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_ca.properties
rename to lti/lti-tool/src/bundle/ltitool_ca.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_de_DE.properties b/lti/lti-tool/src/bundle/ltitool_de_DE.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_de_DE.properties
rename to lti/lti-tool/src/bundle/ltitool_de_DE.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_es.properties b/lti/lti-tool/src/bundle/ltitool_es.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_es.properties
rename to lti/lti-tool/src/bundle/ltitool_es.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_eu.properties b/lti/lti-tool/src/bundle/ltitool_eu.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_eu.properties
rename to lti/lti-tool/src/bundle/ltitool_eu.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_fa_IR.properties b/lti/lti-tool/src/bundle/ltitool_fa_IR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_fa_IR.properties
rename to lti/lti-tool/src/bundle/ltitool_fa_IR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_fr_FR.properties b/lti/lti-tool/src/bundle/ltitool_fr_FR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_fr_FR.properties
rename to lti/lti-tool/src/bundle/ltitool_fr_FR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_hi_IN.properties b/lti/lti-tool/src/bundle/ltitool_hi_IN.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_hi_IN.properties
rename to lti/lti-tool/src/bundle/ltitool_hi_IN.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_ja.properties b/lti/lti-tool/src/bundle/ltitool_ja.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_ja.properties
rename to lti/lti-tool/src/bundle/ltitool_ja.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_mn.properties b/lti/lti-tool/src/bundle/ltitool_mn.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_mn.properties
rename to lti/lti-tool/src/bundle/ltitool_mn.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_pt_BR.properties b/lti/lti-tool/src/bundle/ltitool_pt_BR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_pt_BR.properties
rename to lti/lti-tool/src/bundle/ltitool_pt_BR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_ro_RO.properties b/lti/lti-tool/src/bundle/ltitool_ro_RO.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_ro_RO.properties
rename to lti/lti-tool/src/bundle/ltitool_ro_RO.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_sr.properties b/lti/lti-tool/src/bundle/ltitool_sr.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_sr.properties
rename to lti/lti-tool/src/bundle/ltitool_sr.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_tr_TR.properties b/lti/lti-tool/src/bundle/ltitool_tr_TR.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_tr_TR.properties
rename to lti/lti-tool/src/bundle/ltitool_tr_TR.properties
diff --git a/basiclti/basiclti-tool/src/bundle/ltitool_zh_CN.properties b/lti/lti-tool/src/bundle/ltitool_zh_CN.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/bundle/ltitool_zh_CN.properties
rename to lti/lti-tool/src/bundle/ltitool_zh_CN.properties
diff --git a/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/entityprovider/BLTIEventsEntityProvider.java b/lti/lti-tool/src/java/org/sakaiproject/lti/entityprovider/LTIEventsEntityProvider.java
similarity index 89%
rename from basiclti/basiclti-tool/src/java/org/sakaiproject/blti/entityprovider/BLTIEventsEntityProvider.java
rename to lti/lti-tool/src/java/org/sakaiproject/lti/entityprovider/LTIEventsEntityProvider.java
index 46c3adf0d3ba..c3cd5df85b7c 100644
--- a/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/entityprovider/BLTIEventsEntityProvider.java
+++ b/lti/lti-tool/src/java/org/sakaiproject/lti/entityprovider/LTIEventsEntityProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sakaiproject.blti.tool.entityprovider;
+package org.sakaiproject.lti.tool.entityprovider;
 
 import java.util.Locale;
 import java.util.Map;
@@ -27,7 +27,7 @@
  * An entity provider to register LTI events with SiteStats 
  * 
  */
-public class BLTIEventsEntityProvider extends AbstractEntityProvider implements AutoRegisterEntityProvider, Statisticable, Describeable {
+public class LTIEventsEntityProvider extends AbstractEntityProvider implements AutoRegisterEntityProvider, Statisticable, Describeable {
 
 	public final static String PREFIX = "basiclti-events";
 	public final static String TOOL_ID = "sakai.basiclti";
diff --git a/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java b/lti/lti-tool/src/java/org/sakaiproject/lti/tool/LTIAdminTool.java
similarity index 98%
rename from basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java
rename to lti/lti-tool/src/java/org/sakaiproject/lti/tool/LTIAdminTool.java
index 59000f1d4f12..ec22a057db4c 100644
--- a/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java
+++ b/lti/lti-tool/src/java/org/sakaiproject/lti/tool/LTIAdminTool.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  ********************************************************************************* */
-package org.sakaiproject.blti.tool;
+package org.sakaiproject.lti.tool;
 
 import java.util.Arrays;
 import java.util.ArrayList;
@@ -48,8 +48,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
-import org.tsugi.basiclti.ContentItem;
-import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.lti.ContentItem;
+import org.tsugi.lti.LTIConstants;
 import org.tsugi.lti13.LTI13Util;
 import org.tsugi.lti13.DeepLinkResponse;
 import org.sakaiproject.lti13.LineItemUtil;
@@ -60,11 +60,11 @@
 import org.json.simple.JSONArray;
 
 import org.tsugi.util.Base64DoubleUrlEncodeSafe;
-import static org.tsugi.basiclti.BasicLTIUtil.getObject;
-import static org.tsugi.basiclti.BasicLTIUtil.getString;
+import static org.tsugi.lti.LTIUtil.getObject;
+import static org.tsugi.lti.LTIUtil.getString;
 
 import org.sakaiproject.grading.api.Assignment;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.cheftool.Context;
 import org.sakaiproject.cheftool.JetspeedRunData;
 import org.sakaiproject.cheftool.RunData;
@@ -586,7 +586,7 @@ public String buildToolSystemPanelContext(VelocityPortlet portlet, Context conte
 		context.put("isAdmin", new Boolean(ltiService.isAdmin(getSiteId(state))));
 		context.put("doEndHelper", BUTTON + "doEndHelper");
 		if (ltiService.isAdmin(getSiteId(state))
-				&& serverConfigurationService.getString(SakaiBLTIUtil.BASICLTI_ENCRYPTION_KEY, null) == null) {
+				&& serverConfigurationService.getString(SakaiLTIUtil.LTI_ENCRYPTION_KEY, null) == null) {
 			context.put("configMessage", rb.getString("error.tool.no.encryption.key"));
 		}
 
@@ -602,7 +602,7 @@ public String buildToolSystemPanelContext(VelocityPortlet portlet, Context conte
 		List<Map<String, Object>> tools = ltiService.getTools(null, null, 0, 0, getSiteId(state));
 		for (Map<String, Object> tool : tools) {
 			String privacyUrl = LTIService.LAUNCH_PREFIX + getSiteId(state) + "/tool:" + tool.get(LTIService.LTI_ID)+"?"+
-					SakaiBLTIUtil.MESSAGE_TYPE_PARAMETER + "=" + SakaiBLTIUtil.MESSAGE_TYPE_PARAMETER_PRIVACY;
+					SakaiLTIUtil.MESSAGE_TYPE_PARAMETER + "=" + SakaiLTIUtil.MESSAGE_TYPE_PARAMETER_PRIVACY;
 			tool.put("privacy_url", privacyUrl);
 		}
 
@@ -661,21 +661,21 @@ public String buildToolPostInsertPanelContext(VelocityPortlet portlet, Context c
 
 		context.put("clientId", tool.get(LTIService.LTI13_CLIENT_ID));
 
-		String keySetUrl = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/keyset";
+		String keySetUrl = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/keyset";
 		context.put("keySetUrl", keySetUrl);
-		String tokenUrl = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/token/" + tool.get(LTIService.LTI_ID);
+		String tokenUrl = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/token/" + tool.get(LTIService.LTI_ID);
 		context.put("tokenUrl", tokenUrl);
-		String authOIDC = SakaiBLTIUtil.getOurServerUrl() + "/imsoidc/lti13/oidc_auth";
+		String authOIDC = SakaiLTIUtil.getOurServerUrl() + "/imsoidc/lti13/oidc_auth";
 		context.put("authOIDC", authOIDC);
 
 		String site_id = (String) tool.get(LTIService.LTI_SITE_ID);
-		String issuerURL = SakaiBLTIUtil.getIssuer(site_id);
+		String issuerURL = SakaiLTIUtil.getIssuer(site_id);
 		context.put("issuerURL", issuerURL);
 
-		String deploymentId = SakaiBLTIUtil.getDeploymentId(site_id);
+		String deploymentId = SakaiLTIUtil.getDeploymentId(site_id);
 		context.put("deploymentId", deploymentId);
 
-		String configUrl = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/sakai_config";
+		String configUrl = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/sakai_config";
 		configUrl += "?key=" + URLEncoder.encode(tool.get(LTIService.LTI_ID).toString());
 		configUrl += "&clientId=" + URLEncoder.encode(tool.get(LTIService.LTI13_CLIENT_ID).toString());
 		configUrl += "&issuerURL=" + URLEncoder.encode(issuerURL);
@@ -757,34 +757,34 @@ private boolean minimalLTI13(Map<String, Object> tool) {
 
 		String keyset = StringUtils.trimToNull((String) tool.get(LTIService.LTI13_LMS_KEYSET));
 		if (keyset == null ) {
-			keyset = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/keyset";
+			keyset = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/keyset";
 			tool.put(LTIService.LTI13_LMS_KEYSET, keyset);
 			retval = true;
 		}
 
 		String endpoint = StringUtils.trimToNull((String) tool.get(LTIService.LTI13_LMS_ENDPOINT));
 		if (endpoint == null ) {
-			endpoint = SakaiBLTIUtil.getOurServerUrl() + "/imsoidc/lti13/oidc_auth";
+			endpoint = SakaiLTIUtil.getOurServerUrl() + "/imsoidc/lti13/oidc_auth";
 			tool.put(LTIService.LTI13_LMS_ENDPOINT, endpoint);
 			retval = true;
 		}
 
 		String tokenurl = StringUtils.trimToNull((String) tool.get(LTIService.LTI13_LMS_TOKEN));
 		if (tokenurl == null && tool_id != null ) {
-			tokenurl = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/token/" + tool_id;
+			tokenurl = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/token/" + tool_id;
 			tool.put(LTIService.LTI13_LMS_TOKEN, tokenurl);
 		}
 
 		String deployment_id = StringUtils.trimToNull((String) tool.get(LTIService.LTI13_LMS_DEPLOYMENT_ID));
 		if ( deployment_id == null ) {
-			deployment_id = SakaiBLTIUtil.getDeploymentId(site_id);
+			deployment_id = SakaiLTIUtil.getDeploymentId(site_id);
 			tool.put(LTIService.LTI13_LMS_DEPLOYMENT_ID, deployment_id);
 			retval = true;
 		}
 
 		String issuer = StringUtils.trimToNull((String) tool.get(LTIService.LTI13_LMS_ISSUER));
 		if ( issuer == null ) {
-			issuer = SakaiBLTIUtil.getIssuer(site_id);
+			issuer = SakaiLTIUtil.getIssuer(site_id);
 			tool.put(LTIService.LTI13_LMS_ISSUER, issuer);
 			retval = true;
 		}
@@ -903,10 +903,10 @@ public void doLaunchAdvantageAuto(RunData data, Context context)
 
 		String site_id = (String) tool.get(LTIService.LTI_SITE_ID);
 		String clientId = (String) tool.get(LTIService.LTI13_CLIENT_ID);
-		String issuerURL = SakaiBLTIUtil.getIssuer(site_id);
-		String deploymentId = SakaiBLTIUtil.getDeploymentId(site_id);
+		String issuerURL = SakaiLTIUtil.getIssuer(site_id);
+		String deploymentId = SakaiLTIUtil.getDeploymentId(site_id);
 
-		String sakaiConfigUrl = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/well_known";
+		String sakaiConfigUrl = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/well_known";
 		sakaiConfigUrl += "?key=" + URLEncoder.encode(toolKey.toString());
 		sakaiConfigUrl += "&clientId=" + URLEncoder.encode(clientId);
 		sakaiConfigUrl += "&issuerURL=" + URLEncoder.encode(issuerURL);
@@ -1533,7 +1533,7 @@ public String buildToolEditPanelContext(VelocityPortlet portlet, Context context
 		minimalLTI13(tool);
 
 		String siteId = (String) tool.get(LTIService.LTI_SITE_ID);
-		context.put("issuerURL", SakaiBLTIUtil.getIssuer(siteId));
+		context.put("issuerURL", SakaiLTIUtil.getIssuer(siteId));
 
 		// If siteId is not blank, there is no option for visibility since the tool is always be visible in the site; otherwise, the tool can be visible or stealth
 		String excludePattern = StringUtils.isNotEmpty(siteId) ? "^SITE_ID:.*|visible:.*" : "^SITE_ID:.*";
@@ -1550,7 +1550,7 @@ public String buildToolEditPanelContext(VelocityPortlet portlet, Context context
 				+ "&id=" + tool.get(LTIService.LTI_ID);
 		context.put("autoStartUrl", autoStartUrl);
 
-		String autoRegistrationUrl = SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/get_registration?key="+tool.get(LTIService.LTI_ID);
+		String autoRegistrationUrl = SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/get_registration?key="+tool.get(LTIService.LTI_ID);
 		context.put("autoRegistrationUrl", autoRegistrationUrl);
 
 		// Tool Deployment
@@ -1833,7 +1833,7 @@ private void doContentPutInternal(RunData data, Context context, Properties reqP
 		if (LTIService.SECRET_HIDDEN.equals(newSecret)) {
 			reqProps.remove(LTIService.LTI_SECRET);
 		} else if (StringUtils.isNotBlank(newSecret)) {
-			newSecret = SakaiBLTIUtil.encryptSecret(newSecret);
+			newSecret = SakaiLTIUtil.encryptSecret(newSecret);
 			reqProps.put(LTIService.LTI_SECRET, newSecret);
 		}		
 		// Does an insert when id is null and update when is is not null
@@ -2081,7 +2081,7 @@ public void doSingleContentItemResponse(RunData data, Context context) {
 
 			DeepLinkResponse dlr;
 			try {
-				dlr = SakaiBLTIUtil.getDeepLinkFromToken(tool, id_token);  // Also checks security
+				dlr = SakaiLTIUtil.getDeepLinkFromToken(tool, id_token);  // Also checks security
 			} catch (Exception e) {
 				addAlert(state, rb.getString("error.deeplink.bad") + " (" + e.getMessage() + ")");
 				switchPanel(state, errorPanel);
@@ -2129,7 +2129,7 @@ public void doSingleContentItemResponse(RunData data, Context context) {
 			// Parse and validate the incoming ContentItem
 			ContentItem contentItem;
 			try {
-				contentItem = SakaiBLTIUtil.getContentItemFromRequest(tool);
+				contentItem = SakaiLTIUtil.getContentItemFromRequest(tool);
 			} catch (Exception e) {
 				addAlert(state, rb.getString("error.contentitem.bad") + " (" + e.getMessage() + ")");
 				switchPanel(state, errorPanel);
@@ -2338,7 +2338,7 @@ public void doMultipleContentItemResponse(RunData data, Context context) {
 
 			DeepLinkResponse dlr;
 			try {
-				dlr = SakaiBLTIUtil.getDeepLinkFromToken(tool, id_token);  // Also checks security
+				dlr = SakaiLTIUtil.getDeepLinkFromToken(tool, id_token);  // Also checks security
 			} catch (Exception e) {
 				addAlert(state, rb.getString("error.deeplink.bad") + " (" + e.getMessage() + ")");
 				switchPanel(state, errorPanel);
@@ -2397,7 +2397,7 @@ public void doMultipleContentItemResponse(RunData data, Context context) {
 				if (content != null) {
 					contentUrl = ltiService.getContentLaunch(content);
 					if (contentUrl != null && contentUrl.startsWith("/")) {
-						contentUrl = SakaiBLTIUtil.getOurServerUrl() + contentUrl;
+						contentUrl = SakaiLTIUtil.getOurServerUrl() + contentUrl;
 					}
 				}
 				if (contentUrl == null) {
@@ -2439,7 +2439,7 @@ public void doMultipleContentItemResponse(RunData data, Context context) {
 			// Parse and validate the incoming ContentItem
 			ContentItem contentItem = null;
 			try {
-				contentItem = SakaiBLTIUtil.getContentItemFromRequest(tool);
+				contentItem = SakaiLTIUtil.getContentItemFromRequest(tool);
 			} catch (Exception e) {
 				addAlert(state, rb.getString("error.contentitem.bad") + " (" + e.getMessage() + ")");
 				switchPanel(state, errorPanel);
@@ -2454,7 +2454,7 @@ public void doMultipleContentItemResponse(RunData data, Context context) {
 					continue;
 				}
 				JSONObject item = (JSONObject) i;
-				String type = getString(item, BasicLTIConstants.TYPE);
+				String type = getString(item, LTIConstants.TYPE);
 				if (!ContentItem.TYPE_LTILINKITEM.equals(type)) {
 					goodcount++;
 					new_content.add(item);
@@ -2494,7 +2494,7 @@ public void doMultipleContentItemResponse(RunData data, Context context) {
 				if (content != null) {
 					contentUrl = ltiService.getContentLaunch(content);
 					if (contentUrl != null && contentUrl.startsWith("/")) {
-						contentUrl = SakaiBLTIUtil.getOurServerUrl() + contentUrl;
+						contentUrl = SakaiLTIUtil.getOurServerUrl() + contentUrl;
 					}
 				}
 				if (contentUrl == null) {
@@ -2921,7 +2921,7 @@ public String buildContentConfigPanelContext(VelocityPortlet portlet, Context co
 				+ "&tool_id=" + tool.get(LTIService.LTI_ID);
 
 		// Add CSRF protection so it actually makes it into the "do" code
-		contentReturn = SakaiBLTIUtil.addCSRFToken(contentReturn);
+		contentReturn = SakaiLTIUtil.addCSRFToken(contentReturn);
 
 		// /acccess/blti/context/tool:12 (does not have a querystring)
 		String contentLaunch = ltiService.getToolLaunch(tool, placement.getContext());
@@ -3237,7 +3237,7 @@ public String buildContentItemGenericMainPanelContext(VelocityPortlet portlet, C
 				+ "&tool_id=" + tool.get(LTIService.LTI_ID);
 
 		// Add CSRF protection so it actually makes it into the "do" code
-		contentReturn = SakaiBLTIUtil.addCSRFToken(contentReturn);
+		contentReturn = SakaiLTIUtil.addCSRFToken(contentReturn);
 
 		// /acccess/blti/context/tool:12 (does not have a querystring)
 		String contentLaunch = ltiService.getToolLaunch(tool, placement.getContext());
@@ -3266,9 +3266,9 @@ public String buildContentItemGenericMainPanelContext(VelocityPortlet portlet, C
 		contentReturn = serverConfigurationService.getServerUrl() + "/imsoidc/lti13/resigncontentitem?forward=" +
 			Base64DoubleUrlEncodeSafe.encode(contentReturn) + "&tool_id=" + tool.get(LTIService.LTI_ID);
 
-		// This will forward to AccessServlet / BasicLTISecurityServiceImpl with a tool: url
+		// This will forward to AccessServlet / LTISecurityServiceImpl with a tool: url
 		// AccessServlet will detect if this is a CI or DL and handle it accordingly using
-		// code from SakaiBLTIUtil - so we don't need two code paths here.
+		// code from SakaiLTIUtil - so we don't need two code paths here.
 		contentLaunch = ContentItem.buildLaunch(contentLaunch, contentReturn, contentData);
 		log.debug("Redirecting to DL/CI launch to={}", contentLaunch);
 		context.put("forwardUrl", contentLaunch);
@@ -3306,7 +3306,7 @@ public String buildPostContentConfigPanelContext(VelocityPortlet portlet, Contex
 		if (content != null) {
 			contentUrl = ltiService.getContentLaunch(content);
 			if (contentUrl != null && contentUrl.startsWith("/")) {
-				contentUrl = SakaiBLTIUtil.getOurServerUrl() + contentUrl;
+				contentUrl = SakaiLTIUtil.getOurServerUrl() + contentUrl;
 			}
 		}
 
@@ -3319,7 +3319,7 @@ public String buildPostContentConfigPanelContext(VelocityPortlet portlet, Contex
 		JSONArray new_content = new JSONArray();
 
 		JSONObject item = (JSONObject) new JSONObject();
-		item.put(BasicLTIConstants.TYPE, ContentItem.TYPE_LTILINKITEM);
+		item.put(LTIConstants.TYPE, ContentItem.TYPE_LTILINKITEM);
 		item.put("launch", contentUrl);
 		String title = (String) content.get(LTIService.LTI_TITLE);
 		if (title == null) {
diff --git a/basiclti/basiclti-tool/src/webapp/WEB-INF/applicationContext.xml b/lti/lti-tool/src/webapp/WEB-INF/applicationContext.xml
similarity index 85%
rename from basiclti/basiclti-tool/src/webapp/WEB-INF/applicationContext.xml
rename to lti/lti-tool/src/webapp/WEB-INF/applicationContext.xml
index 998b8cf25fef..1b88ff68b533 100644
--- a/basiclti/basiclti-tool/src/webapp/WEB-INF/applicationContext.xml
+++ b/lti/lti-tool/src/webapp/WEB-INF/applicationContext.xml
@@ -5,7 +5,7 @@
 
 	<!-- ENTITY PROVIDERS START -->
 	<bean parent="org.sakaiproject.entitybroker.entityprovider.AbstractEntityProvider" 
-		class="org.sakaiproject.blti.tool.entityprovider.BLTIEventsEntityProvider">
+		class="org.sakaiproject.lti.tool.entityprovider.LTIEventsEntityProvider">
 	</bean>
 	<!-- ENTITY PROVIDERS END -->
        
diff --git a/basiclti/basiclti-tool/src/webapp/WEB-INF/tools/sakai.lti.admin.xml b/lti/lti-tool/src/webapp/WEB-INF/tools/sakai.lti.admin.xml
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/WEB-INF/tools/sakai.lti.admin.xml
rename to lti/lti-tool/src/webapp/WEB-INF/tools/sakai.lti.admin.xml
diff --git a/basiclti/basiclti-tool/src/webapp/WEB-INF/web.xml b/lti/lti-tool/src/webapp/WEB-INF/web.xml
similarity index 92%
rename from basiclti/basiclti-tool/src/webapp/WEB-INF/web.xml
rename to lti/lti-tool/src/webapp/WEB-INF/web.xml
index 340d4478ffa8..c114df581e21 100644
--- a/basiclti/basiclti-tool/src/webapp/WEB-INF/web.xml
+++ b/lti/lti-tool/src/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
 
      <servlet>
         <servlet-name>sakai.basiclti.admin</servlet-name>
-        <servlet-class>org.sakaiproject.blti.tool.LTIAdminTool</servlet-class>
+        <servlet-class>org.sakaiproject.lti.tool.LTIAdminTool</servlet-class>
         <init-param>
             <param-name>context_key</param-name>
             <param-value>Context Value</param-value>            
@@ -42,7 +42,7 @@
 
      <servlet>
         <servlet-name>sakai.lti.admin.helper</servlet-name>
-        <servlet-class>org.sakaiproject.blti.tool.LTIAdminTool</servlet-class>
+        <servlet-class>org.sakaiproject.lti.tool.LTIAdminTool</servlet-class>
         <init-param>
             <param-name>helper</param-name>
             <param-value>1</param-value>            
diff --git a/basiclti/basiclti-tool/src/webapp/icons/first.png b/lti/lti-tool/src/webapp/icons/first.png
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/icons/first.png
rename to lti/lti-tool/src/webapp/icons/first.png
diff --git a/basiclti/basiclti-tool/src/webapp/icons/last.png b/lti/lti-tool/src/webapp/icons/last.png
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/icons/last.png
rename to lti/lti-tool/src/webapp/icons/last.png
diff --git a/basiclti/basiclti-tool/src/webapp/icons/next.png b/lti/lti-tool/src/webapp/icons/next.png
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/icons/next.png
rename to lti/lti-tool/src/webapp/icons/next.png
diff --git a/basiclti/basiclti-tool/src/webapp/icons/prev.png b/lti/lti-tool/src/webapp/icons/prev.png
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/icons/prev.png
rename to lti/lti-tool/src/webapp/icons/prev.png
diff --git a/basiclti/basiclti-tool/src/webapp/velocity.properties b/lti/lti-tool/src/webapp/velocity.properties
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/velocity.properties
rename to lti/lti-tool/src/webapp/velocity.properties
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_assignment_return.vm b/lti/lti-tool/src/webapp/vm/lti_assignment_return.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_assignment_return.vm
rename to lti/lti-tool/src/webapp/vm/lti_assignment_return.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content.vm b/lti/lti-tool/src/webapp/vm/lti_content.vm
similarity index 95%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_content.vm
rename to lti/lti-tool/src/webapp/vm/lti_content.vm
index 3c505f36b9c0..c21f7ce35b23 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_content.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_content.vm
@@ -54,9 +54,9 @@ $tlang.getString("content.admin.note")
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_config.vm b/lti/lti-tool/src/webapp/vm/lti_content_config.vm
similarity index 95%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_content_config.vm
rename to lti/lti-tool/src/webapp/vm/lti_content_config.vm
index b3095a7d516a..2d2a13384bb9 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_content_config.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_content_config.vm
@@ -74,9 +74,9 @@ $(document).ready( function() {
     $("#launch-input").hide();
 #end
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_delete.vm b/lti/lti-tool/src/webapp/vm/lti_content_delete.vm
similarity index 93%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_content_delete.vm
rename to lti/lti-tool/src/webapp/vm/lti_content_delete.vm
index 1c681330fa84..efc528fff983 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_content_delete.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_content_delete.vm
@@ -36,9 +36,9 @@
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_insert.vm b/lti/lti-tool/src/webapp/vm/lti_content_insert.vm
similarity index 95%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_content_insert.vm
rename to lti/lti-tool/src/webapp/vm/lti_content_insert.vm
index e6e36fc9e906..5b4d19159a13 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_content_insert.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_content_insert.vm
@@ -70,9 +70,9 @@ $tlang.getString("content.admin.note")
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_redirect.vm b/lti/lti-tool/src/webapp/vm/lti_content_redirect.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_content_redirect.vm
rename to lti/lti-tool/src/webapp/vm/lti_content_redirect.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_editor_done.vm b/lti/lti-tool/src/webapp/vm/lti_editor_done.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_editor_done.vm
rename to lti/lti-tool/src/webapp/vm/lti_editor_done.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_editor_select.vm b/lti/lti-tool/src/webapp/vm/lti_editor_select.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_editor_select.vm
rename to lti/lti-tool/src/webapp/vm/lti_editor_select.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_error.vm b/lti/lti-tool/src/webapp/vm/lti_error.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_error.vm
rename to lti/lti-tool/src/webapp/vm/lti_error.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_finished.vm b/lti/lti-tool/src/webapp/vm/lti_finished.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_finished.vm
rename to lti/lti-tool/src/webapp/vm/lti_finished.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_import_return.vm b/lti/lti-tool/src/webapp/vm/lti_import_return.vm
similarity index 90%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_import_return.vm
rename to lti/lti-tool/src/webapp/vm/lti_import_return.vm
index dc8610de2cbb..c6b16d756e16 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_import_return.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_import_return.vm
@@ -3,7 +3,7 @@
 <script>includeLatestJQuery('lti_import_return.vm');</script>
 <script>
 // https://stackoverflow.com/questions/2506457/how-to-resize-a-iframe-inside-the-containing-page
-var elem = window.parent.document.getElementById('sakai-basiclti-launch-iframe'); // the id of your iframe of course
+var elem = window.parent.document.getElementById('sakai-lti-launch-iframe'); // the id of your iframe of course
 elem.style.height = '40em';
 </script>
 <center>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_link_add.vm b/lti/lti-tool/src/webapp/vm/lti_link_add.vm
similarity index 92%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_link_add.vm
rename to lti/lti-tool/src/webapp/vm/lti_link_add.vm
index 622b86e0379f..eb830cc3fe2c 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_link_add.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_link_add.vm
@@ -24,9 +24,9 @@
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_link_remove.vm b/lti/lti-tool/src/webapp/vm/lti_link_remove.vm
similarity index 90%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_link_remove.vm
rename to lti/lti-tool/src/webapp/vm/lti_link_remove.vm
index 3c645ce00f5a..a1b379abaa68 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_link_remove.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_link_remove.vm
@@ -20,9 +20,9 @@
 <script>includeLatestJQuery('lti_link_remove.vm');</script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_test.vm b/lti/lti-tool/src/webapp/vm/lti_test.vm
similarity index 78%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_test.vm
rename to lti/lti-tool/src/webapp/vm/lti_test.vm
index be6a2d0af522..5a8a1c1e08d6 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_test.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_test.vm
@@ -9,9 +9,9 @@ $preOutput
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_auto_insert.vm b/lti/lti-tool/src/webapp/vm/lti_tool_auto_insert.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_auto_insert.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_auto_insert.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_auto_launch.vm b/lti/lti-tool/src/webapp/vm/lti_tool_auto_launch.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_auto_launch.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_auto_launch.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_delete.vm b/lti/lti-tool/src/webapp/vm/lti_tool_delete.vm
similarity index 91%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_delete.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_delete.vm
index c93c77fb09aa..324c9ce472fb 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_delete.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_delete.vm
@@ -30,9 +30,9 @@
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_edit.vm b/lti/lti-tool/src/webapp/vm/lti_tool_edit.vm
similarity index 95%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_edit.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_edit.vm
index 1b725aa0201a..0bdc7f6d1adf 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_edit.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_edit.vm
@@ -11,14 +11,14 @@
     #if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $formattedText.escapeHtml($alertMessage)</div>#end
     <form action="#toolForm("")" method="post" name="customizeForm" >
 #if ($isEdit && $isAdmin && $autoStartUrl )
-        <div style="float:right" id="lti-advantage-div"><a href="$autoStartUrl" class="btn btn-primary" target="sakai-basiclti-admin-iframe"
+        <div style="float:right" id="lti-advantage-div"><a href="$autoStartUrl" class="btn btn-primary" target="sakai-lti-admin-iframe"
         title="$tlang.getString("tool.lti13.auto.title")" role="button"
         onclick="showIframe(this.title, false);">$tlang.getString("tool.lti13.auto.button")</a></div>
 #end
 
         #if ($canDeploy)
             <div style="float:right; display: none;" id="lti-deployment-div">
-                <a href="$deployUrl" class="btn btn-primary" target="sakai-basiclti-admin-iframe" title="$tlang.getString("deploy.tool.site.title")"
+                <a href="$deployUrl" class="btn btn-primary" target="sakai-lti-admin-iframe" title="$tlang.getString("deploy.tool.site.title")"
                    role="button" onclick="showIframe(this.title, false);">$tlang.getString("deploy.tool.site.button")
                 </a>
             </div>
@@ -36,7 +36,7 @@
 
 #if ($isEdit && $isAdmin && $autoStartUrl )
     <div id="modal-iframe-div" style="display:none" tabindex="-1" role="dialog">
-        <iframe name="sakai-basiclti-admin-iframe" id="sakai-basiclti-admin-iframe" src="/library/image/sakai/spinner.gif" style="min-height: 80vh;" tabindex="0"></iframe>
+        <iframe name="sakai-lti-admin-iframe" id="sakai-lti-admin-iframe" src="/library/image/sakai/spinner.gif" style="min-height: 80vh;" tabindex="0"></iframe>
     </div>
 <script>
 function showIframe(title, doreload) {
@@ -49,8 +49,8 @@ function showIframe(title, doreload) {
         open: function() {
             $("#modal-iframe-div").dialog("option", "width", modalDialogWidth());
             $("#modal-iframe-div").dialog("option", "height", modalDialogHeight());
-            $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-            $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+            $('#sakai-lti-admin-iframe').attr('width', '100%');
+            $('#sakai-lti-admin-iframe').attr('height', '100%');
             // https://stackoverflow.com/questions/1202079/prevent-jquery-ui-dialog-from-setting-focus-to-first-textbox
             $(this).parent().focus();
         },
@@ -58,7 +58,7 @@ function showIframe(title, doreload) {
             if ( doreload ) {
                 location.reload();
             } else {
-                $('#sakai-basiclti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
+                $('#sakai-lti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
             }
         }
     });
@@ -66,8 +66,8 @@ function showIframe(title, doreload) {
     $(window).resize(function() {
         $("#modal-iframe-div").dialog("option", "width", modalDialogWidth());
         $("#modal-iframe-div").dialog("option", "height", modalDialogHeight());
-        $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-        $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+        $('#sakai-lti-admin-iframe').attr('width', '100%');
+        $('#sakai-lti-admin-iframe').attr('height', '100%');
     });
 }
 //]]>
@@ -84,9 +84,9 @@ $(document).ready(function () {
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_insert.vm b/lti/lti-tool/src/webapp/vm/lti_tool_insert.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_insert.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_insert.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_post_insert.vm b/lti/lti-tool/src/webapp/vm/lti_tool_post_insert.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_post_insert.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_post_insert.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm b/lti/lti-tool/src/webapp/vm/lti_tool_site.vm
similarity index 93%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_site.vm
index 334c34a02b43..9620059298ab 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_site.vm
@@ -117,11 +117,11 @@ ${includeLatestJQuery}
 			</div>
 		</div>
         <div id="tools_site_pager" class="pager">
-            <img src="/basiclti-admin-tool/icons/first.png" class="pager_button first #if ($sortIndex == 1) disabled #end" alt="First" />
-            <img src="/basiclti-admin-tool/icons/prev.png" class="pager_button prev #if ($sortIndex == 1) disabled #end" alt="Prev" />
+            <img src="/lti-admin-tool/icons/first.png" class="pager_button first #if ($sortIndex == 1) disabled #end" alt="First" />
+            <img src="/lti-admin-tool/icons/prev.png" class="pager_button prev #if ($sortIndex == 1) disabled #end" alt="Prev" />
             <span class="pagedisplay">$sortIndex - $sortLastIndex ($count_contents)</span> <!-- this can be any element, including an input -->
-            <img src="/basiclti-admin-tool/icons/next.png" class="pager_button next #if ($sortLastIndex == $count_contents) disabled #end" alt="Next" />
-            <img src="/basiclti-admin-tool/icons/last.png" class="pager_button last #if ($sortLastIndex == $count_contents) disabled #end" alt="Last" />
+            <img src="/lti-admin-tool/icons/next.png" class="pager_button next #if ($sortLastIndex == $count_contents) disabled #end" alt="Next" />
+            <img src="/lti-admin-tool/icons/last.png" class="pager_button last #if ($sortLastIndex == $count_contents) disabled #end" alt="Last" />
             <select class="pagesize">
                 <option #if ($sortPageSize == 10) selected="selected" #end value="10">10</option>
                 <option #if ($sortPageSize == 50) selected="selected" #end value="50">50</option>
@@ -219,9 +219,9 @@ ${includeLatestJQuery}
 <script>
 $(document).ready( function() {
 	## Does nothing if we are not in a frame of the right name
-	setMainFrameHeight('sakai-basiclti-admin-iframe'); 
+	setMainFrameHeight('sakai-lti-admin-iframe'); 
 	$(window).resize( function() {
-		setMainFrameHeight('sakai-basiclti-admin-iframe');
+		setMainFrameHeight('sakai-lti-admin-iframe');
 	});
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_delete.vm b/lti/lti-tool/src/webapp/vm/lti_tool_site_delete.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_delete.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_site_delete.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_deploy.vm b/lti/lti-tool/src/webapp/vm/lti_tool_site_deploy.vm
similarity index 94%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_deploy.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_site_deploy.vm
index 8c4897f2a5a7..518b0d0554e8 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_deploy.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_site_deploy.vm
@@ -116,11 +116,11 @@ ${includeLatestJQuery}
                 <div>$tlang.getString("tool.site.description")</div>
 
                 <div id="tool_site_pager" class="pager">
-                    <img src="/basiclti-admin-tool/icons/first.png" class="pager_button first" alt="First" />
-                    <img src="/basiclti-admin-tool/icons/prev.png" class="pager_button prev" alt="Prev" />
+                    <img src="/lti-admin-tool/icons/first.png" class="pager_button first" alt="First" />
+                    <img src="/lti-admin-tool/icons/prev.png" class="pager_button prev" alt="Prev" />
                     <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-                    <img src="/basiclti-admin-tool/icons/next.png" class="pager_button next" alt="Next" />
-                    <img src="/basiclti-admin-tool/icons/last.png" class="pager_button last" alt="Last" />
+                    <img src="/lti-admin-tool/icons/next.png" class="pager_button next" alt="Next" />
+                    <img src="/lti-admin-tool/icons/last.png" class="pager_button last" alt="Last" />
                     <select class="pagesize" style="padding: 0.3em 2.2em 0.3em 0.5em;"><!-- undo padding: 0 from .tablesorter-pager select and recert to _compass.scss padding -->
                         <option value="10">10</option>
                         <option selected="selected" value="50">50</option>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_edit.vm b/lti/lti-tool/src/webapp/vm/lti_tool_site_edit.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_edit.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_site_edit.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_insert.vm b/lti/lti-tool/src/webapp/vm/lti_tool_site_insert.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_site_insert.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_site_insert.vm
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm b/lti/lti-tool/src/webapp/vm/lti_tool_system.vm
similarity index 95%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_system.vm
index 09d619b8749b..55942da2adcd 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_system.vm
@@ -120,11 +120,11 @@ ${includeLatestJQuery}
 		$tlang.getString("tool.description.system")
 		<br/>
 		<div id="tools_system_pager" class="pager">
-			<img src="/basiclti-admin-tool/icons/first.png" class="pager_button first" alt="First" />
-			<img src="/basiclti-admin-tool/icons/prev.png" class="pager_button prev" alt="Prev" />
+			<img src="/lti-admin-tool/icons/first.png" class="pager_button first" alt="First" />
+			<img src="/lti-admin-tool/icons/prev.png" class="pager_button prev" alt="Prev" />
 			<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-			<img src="/basiclti-admin-tool/icons/next.png" class="pager_button next" alt="Next" />
-			<img src="/basiclti-admin-tool/icons/last.png" class="pager_button last" alt="Last" />
+			<img src="/lti-admin-tool/icons/next.png" class="pager_button next" alt="Next" />
+			<img src="/lti-admin-tool/icons/last.png" class="pager_button last" alt="Last" />
 			<select class="pagesize" style="padding: 0.3em 2.2em 0.3em 0.5em;"><!-- undo padding: 0 from .tablesorter-pager select and recert to _compass.scss padding -->
 				<option value="10">10</option>
 				<option selected="selected" value="50">50</option>
@@ -204,9 +204,9 @@ ${includeLatestJQuery}
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_transfer.vm b/lti/lti-tool/src/webapp/vm/lti_tool_transfer.vm
similarity index 94%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_transfer.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_transfer.vm
index e4bbcaa5e02e..d472ae393c82 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_transfer.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_transfer.vm
@@ -43,9 +43,9 @@
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 });
 </script>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_view.vm b/lti/lti-tool/src/webapp/vm/lti_tool_view.vm
similarity index 94%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_tool_view.vm
rename to lti/lti-tool/src/webapp/vm/lti_tool_view.vm
index cc60f3d71e6b..4fba54ab6640 100644
--- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_view.vm
+++ b/lti/lti-tool/src/webapp/vm/lti_tool_view.vm
@@ -16,9 +16,9 @@
 <script>
 $(document).ready( function() {
         ## Does nothing if we are not in a frame of the right name
-        setMainFrameHeight('sakai-basiclti-admin-iframe');
+        setMainFrameHeight('sakai-lti-admin-iframe');
         $(window).resize( function() {
-                setMainFrameHeight('sakai-basiclti-admin-iframe');
+                setMainFrameHeight('sakai-lti-admin-iframe');
         });
 
         // Add copy buttons
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_top_refresh.vm b/lti/lti-tool/src/webapp/vm/lti_top_refresh.vm
similarity index 100%
rename from basiclti/basiclti-tool/src/webapp/vm/lti_top_refresh.vm
rename to lti/lti-tool/src/webapp/vm/lti_top_refresh.vm
diff --git a/basiclti/pom.xml b/lti/pom.xml
similarity index 89%
rename from basiclti/pom.xml
rename to lti/pom.xml
index 091a9d9d51b7..f6e2b39dfd54 100644
--- a/basiclti/pom.xml
+++ b/lti/pom.xml
@@ -9,19 +9,19 @@
         <relativePath>../master/pom.xml</relativePath>
     </parent>
     
-    <name>Sakai LTI base pom (basiclti)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti</artifactId>
+    <name>Sakai LTI base pom (lti)</name>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>basiclti-common</module>
-        <module>basiclti-api</module>
-        <module>basiclti-impl</module>
-        <module>basiclti-portlet</module>
-        <module>basiclti-blis</module>
-        <module>basiclti-oidc</module>
-        <module>basiclti-tool</module>
+        <module>lti-common</module>
+        <module>lti-api</module>
+        <module>lti-impl</module>
+        <module>lti-portlet</module>
+        <module>lti-blis</module>
+        <module>lti-oidc</module>
+        <module>lti-tool</module>
         <module>portlet-util</module>
         <module>tsugi-util</module>
         <module>web-ifp</module>
@@ -131,21 +131,21 @@
         <dependencies>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>basiclti-api</artifactId>
+                <artifactId>lti-api</artifactId>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>basiclti-impl</artifactId>
+                <artifactId>lti-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>basiclti-common</artifactId>
+                <artifactId>lti-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>basiclti-util</artifactId>
+                <artifactId>lti-util</artifactId>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
diff --git a/basiclti/portlet-util/maven.xml b/lti/portlet-util/maven.xml
similarity index 100%
rename from basiclti/portlet-util/maven.xml
rename to lti/portlet-util/maven.xml
diff --git a/basiclti/portlet-util/pom.xml b/lti/portlet-util/pom.xml
similarity index 92%
rename from basiclti/portlet-util/pom.xml
rename to lti/portlet-util/pom.xml
index 8bd5fec1a9c1..03782a7d0839 100644
--- a/basiclti/portlet-util/pom.xml
+++ b/lti/portlet-util/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.sakaiproject.basiclti</groupId>
-        <artifactId>basiclti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
+        <artifactId>lti</artifactId>
         <version>25-SNAPSHOT</version>
     </parent>
 
     <name>Portlet utilities (portlet-util)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
+    <groupId>org.sakaiproject.lti</groupId>
     <artifactId>portlet-util</artifactId>
     <packaging>jar</packaging>
 
diff --git a/basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/JSPHelper.java b/lti/portlet-util/src/java/org/sakaiproject/portlet/util/JSPHelper.java
similarity index 100%
rename from basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/JSPHelper.java
rename to lti/portlet-util/src/java/org/sakaiproject/portlet/util/JSPHelper.java
diff --git a/basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/PortalUser.java b/lti/portlet-util/src/java/org/sakaiproject/portlet/util/PortalUser.java
similarity index 100%
rename from basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/PortalUser.java
rename to lti/portlet-util/src/java/org/sakaiproject/portlet/util/PortalUser.java
diff --git a/basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/PortletHelper.java b/lti/portlet-util/src/java/org/sakaiproject/portlet/util/PortletHelper.java
similarity index 100%
rename from basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/PortletHelper.java
rename to lti/portlet-util/src/java/org/sakaiproject/portlet/util/PortletHelper.java
diff --git a/basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiPortletUtil.java b/lti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiPortletUtil.java
similarity index 100%
rename from basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiPortletUtil.java
rename to lti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiPortletUtil.java
diff --git a/basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiSite.java b/lti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiSite.java
similarity index 100%
rename from basiclti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiSite.java
rename to lti/portlet-util/src/java/org/sakaiproject/portlet/util/SakaiSite.java
diff --git a/basiclti/tsugi-util/LICENSE b/lti/tsugi-util/LICENSE
similarity index 100%
rename from basiclti/tsugi-util/LICENSE
rename to lti/tsugi-util/LICENSE
diff --git a/basiclti/tsugi-util/NOTICE b/lti/tsugi-util/NOTICE
similarity index 96%
rename from basiclti/tsugi-util/NOTICE
rename to lti/tsugi-util/NOTICE
index 76c9e5981e06..dfec05a656fc 100644
--- a/basiclti/tsugi-util/NOTICE
+++ b/lti/tsugi-util/NOTICE
@@ -24,12 +24,12 @@ the Sakai source tree and create a separate repository to make it simpler
 for folks to make use of the code outside of Sakai.  This independent 
 fork was done with the approval of Charles R. Severance.
 
-	https://github.com/pfgray/basiclti-util-java.git
+	https://github.com/pfgray/lti-util-java.git
 
 In June 2015, Paul was asked to move the repository from his own personal
 account into an IMS owned github repository:
 
-	https://github.com/IMSGlobal/basiclti-util-java
+	https://github.com/IMSGlobal/lti-util-java
 
 This was also done with the apporval of Charles R. Severance
 
diff --git a/basiclti/tsugi-util/README.md b/lti/tsugi-util/README.md
similarity index 91%
rename from basiclti/tsugi-util/README.md
rename to lti/tsugi-util/README.md
index b513567ebcab..8ace70652650 100644
--- a/basiclti/tsugi-util/README.md
+++ b/lti/tsugi-util/README.md
@@ -9,15 +9,15 @@ and make the process more opaque to the developer.
 There is no Sakai-specific code but the code is developed and maintained in the 
 Sakai repository since it is so core to Sakai and heavily tested being part of 
 Sakai.  Please do **not** put any org.sakaiproject dependencies to this folder
-please use `basiclti-common` for code with org.sakaiproject dependencies.
+please use `lti-common` for code with org.sakaiproject dependencies.
 
 This code is released in two ways.  Within Sakai this code is normally released
 as part of the Sakai build process:
 
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti-util</artifactId>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti-util</artifactId>
 
-The *org.sakaiproject.basiclti* artifact simply tracks the Sakai versioning 
+The *org.sakaiproject.lti* artifact simply tracks the Sakai versioning 
 and is updated automatically by the Sakai release processes.  Over the years,
 folks have used this code in their java apps by pulling in a particular Sakai
 version of this code.
@@ -92,7 +92,7 @@ Releasing tsugi-util to Sonatype
 
 Set up `settings.xml` as described above.
 
-    cd trunk/basiclti/tsugi-util
+    cd trunk/lti/tsugi-util
     cp pom-tsugi.xml pom.xml
     mvn compile install deploy
     git checkout pom.xml
diff --git a/basiclti/tsugi-util/maven.xml b/lti/tsugi-util/maven.xml
similarity index 100%
rename from basiclti/tsugi-util/maven.xml
rename to lti/tsugi-util/maven.xml
diff --git a/basiclti/tsugi-util/pom-tsugi.xml b/lti/tsugi-util/pom-tsugi.xml
similarity index 100%
rename from basiclti/tsugi-util/pom-tsugi.xml
rename to lti/tsugi-util/pom-tsugi.xml
diff --git a/basiclti/tsugi-util/pom.xml b/lti/tsugi-util/pom.xml
similarity index 91%
rename from basiclti/tsugi-util/pom.xml
rename to lti/tsugi-util/pom.xml
index 2314aebc06da..4c9e6eccbb27 100644
--- a/basiclti/tsugi-util/pom.xml
+++ b/lti/tsugi-util/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
 
-    <name>Tsugi LTI Utilities (basiclti-util variant)</name>
-    <groupId>org.sakaiproject.basiclti</groupId>
-    <artifactId>basiclti-util</artifactId>
+    <name>Tsugi LTI Utilities (lti-util variant)</name>
+    <groupId>org.sakaiproject.lti</groupId>
+    <artifactId>lti-util</artifactId>
     <organization>
         <name>Tsugi Project</name>
         <url>www.tsugi.org/</url>
@@ -24,7 +24,7 @@
 
     <dependencies>
         <!-- This pom should *never* add any "org.sakaiproject" dependencies - any
-            Sakai-specific code needs to be placed in the basiclti-common folder -->
+            Sakai-specific code needs to be placed in the lti-common folder -->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/basiclti/tsugi-util/src/java/net/oauth/ConsumerProperties.java b/lti/tsugi-util/src/java/net/oauth/ConsumerProperties.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/ConsumerProperties.java
rename to lti/tsugi-util/src/java/net/oauth/ConsumerProperties.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuth.java b/lti/tsugi-util/src/java/net/oauth/OAuth.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuth.java
rename to lti/tsugi-util/src/java/net/oauth/OAuth.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthAccessor.java b/lti/tsugi-util/src/java/net/oauth/OAuthAccessor.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthAccessor.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthAccessor.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthConsumer.java b/lti/tsugi-util/src/java/net/oauth/OAuthConsumer.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthConsumer.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthConsumer.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthException.java b/lti/tsugi-util/src/java/net/oauth/OAuthException.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthException.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthException.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthMessage.java b/lti/tsugi-util/src/java/net/oauth/OAuthMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthMessage.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthMessage.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthProblemException.java b/lti/tsugi-util/src/java/net/oauth/OAuthProblemException.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthProblemException.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthProblemException.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthServiceProvider.java b/lti/tsugi-util/src/java/net/oauth/OAuthServiceProvider.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthServiceProvider.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthServiceProvider.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/OAuthValidator.java b/lti/tsugi-util/src/java/net/oauth/OAuthValidator.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/OAuthValidator.java
rename to lti/tsugi-util/src/java/net/oauth/OAuthValidator.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/ParameterStyle.java b/lti/tsugi-util/src/java/net/oauth/ParameterStyle.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/ParameterStyle.java
rename to lti/tsugi-util/src/java/net/oauth/ParameterStyle.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/SimpleOAuthValidator.java b/lti/tsugi-util/src/java/net/oauth/SimpleOAuthValidator.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/SimpleOAuthValidator.java
rename to lti/tsugi-util/src/java/net/oauth/SimpleOAuthValidator.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/client/ExcerptInputStream.java b/lti/tsugi-util/src/java/net/oauth/client/ExcerptInputStream.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/client/ExcerptInputStream.java
rename to lti/tsugi-util/src/java/net/oauth/client/ExcerptInputStream.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/client/OAuthClient.java b/lti/tsugi-util/src/java/net/oauth/client/OAuthClient.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/client/OAuthClient.java
rename to lti/tsugi-util/src/java/net/oauth/client/OAuthClient.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/client/OAuthResponseMessage.java b/lti/tsugi-util/src/java/net/oauth/client/OAuthResponseMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/client/OAuthResponseMessage.java
rename to lti/tsugi-util/src/java/net/oauth/client/OAuthResponseMessage.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/consumer.properties.sample b/lti/tsugi-util/src/java/net/oauth/consumer.properties.sample
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/consumer.properties.sample
rename to lti/tsugi-util/src/java/net/oauth/consumer.properties.sample
diff --git a/basiclti/tsugi-util/src/java/net/oauth/http/HttpClient.java b/lti/tsugi-util/src/java/net/oauth/http/HttpClient.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/http/HttpClient.java
rename to lti/tsugi-util/src/java/net/oauth/http/HttpClient.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/http/HttpMessage.java b/lti/tsugi-util/src/java/net/oauth/http/HttpMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/http/HttpMessage.java
rename to lti/tsugi-util/src/java/net/oauth/http/HttpMessage.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/http/HttpMessageDecoder.java b/lti/tsugi-util/src/java/net/oauth/http/HttpMessageDecoder.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/http/HttpMessageDecoder.java
rename to lti/tsugi-util/src/java/net/oauth/http/HttpMessageDecoder.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/http/HttpResponseMessage.java b/lti/tsugi-util/src/java/net/oauth/http/HttpResponseMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/http/HttpResponseMessage.java
rename to lti/tsugi-util/src/java/net/oauth/http/HttpResponseMessage.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/server/HttpRequestMessage.java b/lti/tsugi-util/src/java/net/oauth/server/HttpRequestMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/server/HttpRequestMessage.java
rename to lti/tsugi-util/src/java/net/oauth/server/HttpRequestMessage.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/server/OAuthServlet.java b/lti/tsugi-util/src/java/net/oauth/server/OAuthServlet.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/server/OAuthServlet.java
rename to lti/tsugi-util/src/java/net/oauth/server/OAuthServlet.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/Base64.java b/lti/tsugi-util/src/java/net/oauth/signature/Base64.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/Base64.java
rename to lti/tsugi-util/src/java/net/oauth/signature/Base64.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA1.java b/lti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA1.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA1.java
rename to lti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA1.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA256.java b/lti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA256.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA256.java
rename to lti/tsugi-util/src/java/net/oauth/signature/HMAC_SHA256.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/OAuthSignatureMethod.java b/lti/tsugi-util/src/java/net/oauth/signature/OAuthSignatureMethod.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/OAuthSignatureMethod.java
rename to lti/tsugi-util/src/java/net/oauth/signature/OAuthSignatureMethod.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/PLAINTEXT.java b/lti/tsugi-util/src/java/net/oauth/signature/PLAINTEXT.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/PLAINTEXT.java
rename to lti/tsugi-util/src/java/net/oauth/signature/PLAINTEXT.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/RSA_SHA1.java b/lti/tsugi-util/src/java/net/oauth/signature/RSA_SHA1.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/RSA_SHA1.java
rename to lti/tsugi-util/src/java/net/oauth/signature/RSA_SHA1.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/pem/Asn1Object.java b/lti/tsugi-util/src/java/net/oauth/signature/pem/Asn1Object.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/pem/Asn1Object.java
rename to lti/tsugi-util/src/java/net/oauth/signature/pem/Asn1Object.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/pem/DerParser.java b/lti/tsugi-util/src/java/net/oauth/signature/pem/DerParser.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/pem/DerParser.java
rename to lti/tsugi-util/src/java/net/oauth/signature/pem/DerParser.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/pem/PEMReader.java b/lti/tsugi-util/src/java/net/oauth/signature/pem/PEMReader.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/pem/PEMReader.java
rename to lti/tsugi-util/src/java/net/oauth/signature/pem/PEMReader.java
diff --git a/basiclti/tsugi-util/src/java/net/oauth/signature/pem/PKCS1EncodedKeySpec.java b/lti/tsugi-util/src/java/net/oauth/signature/pem/PKCS1EncodedKeySpec.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/net/oauth/signature/pem/PKCS1EncodedKeySpec.java
rename to lti/tsugi-util/src/java/net/oauth/signature/pem/PKCS1EncodedKeySpec.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/HACK/HackMoodle.java b/lti/tsugi-util/src/java/org/tsugi/HACK/HackMoodle.java
similarity index 95%
rename from basiclti/tsugi-util/src/java/org/tsugi/HACK/HackMoodle.java
rename to lti/tsugi-util/src/java/org/tsugi/HACK/HackMoodle.java
index 3fc75ff9e289..3c51f6d23cfa 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/HACK/HackMoodle.java
+++ b/lti/tsugi-util/src/java/org/tsugi/HACK/HackMoodle.java
@@ -1,7 +1,7 @@
 
 package org.tsugi.HACK;
 
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 import org.json.simple.JSONValue;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONArray;
@@ -40,7 +40,7 @@ public class HackMoodle {
 
 	public static String hackOpenIdConfiguration(String body)
 	{
-		JSONObject jso = BasicLTIUtil.parseJSONObject(body);
+		JSONObject jso = LTIUtil.parseJSONObject(body);
 		if ( jso == null ) return body;
 
 		JSONObject pc = (JSONObject) jso.get("https://purl.imsglobal.org/spec/lti-platform-configuration");
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/HACK/README.md b/lti/tsugi-util/src/java/org/tsugi/HACK/README.md
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/HACK/README.md
rename to lti/tsugi-util/src/java/org/tsugi/HACK/README.md
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/LineItem.java b/lti/tsugi-util/src/java/org/tsugi/ags2/objects/LineItem.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/LineItem.java
rename to lti/tsugi-util/src/java/org/tsugi/ags2/objects/LineItem.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/Result.java b/lti/tsugi-util/src/java/org/tsugi/ags2/objects/Result.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/Result.java
rename to lti/tsugi-util/src/java/org/tsugi/ags2/objects/Result.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/Score.java b/lti/tsugi-util/src/java/org/tsugi/ags2/objects/Score.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/Score.java
rename to lti/tsugi-util/src/java/org/tsugi/ags2/objects/Score.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/SubmissionReview.java b/lti/tsugi-util/src/java/org/tsugi/ags2/objects/SubmissionReview.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/ags2/objects/SubmissionReview.java
rename to lti/tsugi-util/src/java/org/tsugi/ags2/objects/SubmissionReview.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/ContentItemResponse.java b/lti/tsugi-util/src/java/org/tsugi/contentitem/objects/ContentItemResponse.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/ContentItemResponse.java
rename to lti/tsugi-util/src/java/org/tsugi/contentitem/objects/ContentItemResponse.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/Icon.java b/lti/tsugi-util/src/java/org/tsugi/contentitem/objects/Icon.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/Icon.java
rename to lti/tsugi-util/src/java/org/tsugi/contentitem/objects/Icon.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/LtiLinkItem.java b/lti/tsugi-util/src/java/org/tsugi/contentitem/objects/LtiLinkItem.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/LtiLinkItem.java
rename to lti/tsugi-util/src/java/org/tsugi/contentitem/objects/LtiLinkItem.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/PlacementAdvice.java b/lti/tsugi-util/src/java/org/tsugi/contentitem/objects/PlacementAdvice.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/contentitem/objects/PlacementAdvice.java
rename to lti/tsugi-util/src/java/org/tsugi/contentitem/objects/PlacementAdvice.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/ContentItem.java b/lti/tsugi-util/src/java/org/tsugi/deeplink/objects/ContentItem.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/ContentItem.java
rename to lti/tsugi-util/src/java/org/tsugi/deeplink/objects/ContentItem.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/DeepLinkResponse.java b/lti/tsugi-util/src/java/org/tsugi/deeplink/objects/DeepLinkResponse.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/DeepLinkResponse.java
rename to lti/tsugi-util/src/java/org/tsugi/deeplink/objects/DeepLinkResponse.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/LtiResourceLink.java b/lti/tsugi-util/src/java/org/tsugi/deeplink/objects/LtiResourceLink.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/LtiResourceLink.java
rename to lti/tsugi-util/src/java/org/tsugi/deeplink/objects/LtiResourceLink.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/MiniLineItem.java b/lti/tsugi-util/src/java/org/tsugi/deeplink/objects/MiniLineItem.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/deeplink/objects/MiniLineItem.java
rename to lti/tsugi-util/src/java/org/tsugi/deeplink/objects/MiniLineItem.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/http/HttpClientUtil.java b/lti/tsugi-util/src/java/org/tsugi/http/HttpClientUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/http/HttpClientUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/http/HttpClientUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/http/HttpUtil.java b/lti/tsugi-util/src/java/org/tsugi/http/HttpUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/http/HttpUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/http/HttpUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/jackson/JacksonUtil.java b/lti/tsugi-util/src/java/org/tsugi/jackson/JacksonUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/jackson/JacksonUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/jackson/JacksonUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/jackson/objects/JacksonBase.java b/lti/tsugi-util/src/java/org/tsugi/jackson/objects/JacksonBase.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/jackson/objects/JacksonBase.java
rename to lti/tsugi-util/src/java/org/tsugi/jackson/objects/JacksonBase.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/json/IMSJSONRequest.java b/lti/tsugi-util/src/java/org/tsugi/json/IMSJSONRequest.java
similarity index 99%
rename from basiclti/tsugi-util/src/java/org/tsugi/json/IMSJSONRequest.java
rename to lti/tsugi-util/src/java/org/tsugi/json/IMSJSONRequest.java
index 7a8280af128c..86152598f80e 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/json/IMSJSONRequest.java
+++ b/lti/tsugi-util/src/java/org/tsugi/json/IMSJSONRequest.java
@@ -23,7 +23,7 @@
 import net.oauth.server.OAuthServlet;
 import net.oauth.signature.OAuthSignatureMethod;
 
-import org.tsugi.basiclti.Base64;
+import org.tsugi.lti.Base64;
 import org.json.simple.JSONValue;
 
 @Slf4j
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/Base64.java b/lti/tsugi-util/src/java/org/tsugi/lti/Base64.java
similarity index 99%
rename from basiclti/tsugi-util/src/java/org/tsugi/basiclti/Base64.java
rename to lti/tsugi-util/src/java/org/tsugi/lti/Base64.java
index afa84972eb8e..d7cbab4516b2 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/Base64.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti/Base64.java
@@ -18,7 +18,7 @@
  *  limitations under the License.
  */
 
-package org.tsugi.basiclti;
+package org.tsugi.lti;
 // package org.apache.commons.httpclient.util;
 
 // import org.apache.commons.httpclient.HttpConstants;
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/ContentItem.java b/lti/tsugi-util/src/java/org/tsugi/lti/ContentItem.java
similarity index 96%
rename from basiclti/tsugi-util/src/java/org/tsugi/basiclti/ContentItem.java
rename to lti/tsugi-util/src/java/org/tsugi/lti/ContentItem.java
index b53fc65050ca..5292c2f73abb 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/ContentItem.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti/ContentItem.java
@@ -17,7 +17,7 @@
  * permissions and limitations under the License.
  */
 
-package org.tsugi.basiclti;
+package org.tsugi.lti;
 
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -42,10 +42,10 @@
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 
-import static org.tsugi.basiclti.BasicLTIUtil.getArray;
-import static org.tsugi.basiclti.BasicLTIUtil.getObject;
-import static org.tsugi.basiclti.BasicLTIUtil.getString;
-import static org.tsugi.basiclti.BasicLTIUtil.getDouble;
+import static org.tsugi.lti.LTIUtil.getArray;
+import static org.tsugi.lti.LTIUtil.getObject;
+import static org.tsugi.lti.LTIUtil.getString;
+import static org.tsugi.lti.LTIUtil.getDouble;
 
 // https://www.imsglobal.org/specs/lticiv1p0/specification
 /* {
@@ -178,7 +178,7 @@ public ContentItem(HttpServletRequest req)
 			dataProps.setProperty(key, (String) value);
 		}
 
-		graph = getArray(contentItem,BasicLTIConstants.GRAPH);
+		graph = getArray(contentItem,LTIConstants.GRAPH);
 		if ( graph == null ) {
 			throw new java.lang.RuntimeException(NO_GRAPH_MESSAGE);
 		}
@@ -259,7 +259,7 @@ public JSONObject getItemOfType(String itemType)
 		for ( Object i : graph ) {
 			if ( ! (i instanceof JSONObject) ) continue;
 			JSONObject item = (JSONObject) i;
-			String type = getString(item, BasicLTIConstants.TYPE);
+			String type = getString(item, LTIConstants.TYPE);
 			if ( type == null ) continue;
 			if ( type.equals(itemType) ) return item;
 		}
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIConstants.java b/lti/tsugi-util/src/java/org/tsugi/lti/LTIConstants.java
similarity index 99%
rename from basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIConstants.java
rename to lti/tsugi-util/src/java/org/tsugi/lti/LTIConstants.java
index 4bb0e83936c7..066be8b86e53 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIConstants.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti/LTIConstants.java
@@ -13,9 +13,9 @@
  * implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.tsugi.basiclti;
+package org.tsugi.lti;
 
-public class BasicLTIConstants {
+public class LTIConstants {
 	/**
 	 * context_id=8213060-006f-27b2066ac545
 	 * <p>
@@ -537,7 +537,7 @@ public class BasicLTIConstants {
 	/**
 	 * The default site type to use if a site needs to be created. Can be overriden in sakai.properties or as part of the launch.
 	 * This contains a number of preconfigured roles, so that the IMS role vocabulary can be used.
-	 * See BLTI-151
+	 * See LTI-151
 	 */
 	public static final String NEW_SITE_TYPE = "lti";
 
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIUtil.java b/lti/tsugi-util/src/java/org/tsugi/lti/LTIUtil.java
similarity index 95%
rename from basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/lti/LTIUtil.java
index 976a027c3028..8933c5ca2848 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIUtil.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti/LTIUtil.java
@@ -18,19 +18,19 @@
  * permissions and limitations under the License.
  */
 
-package org.tsugi.basiclti;
-
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_MESSAGE_TYPE_BASICLTILAUNCHREQUEST;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_MESSAGE_TYPE_CONTENTITEMSELECTIONREQUEST;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_VERSION;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_VERSION_1;
-import static org.tsugi.basiclti.BasicLTIConstants.CUSTOM_PREFIX;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_MESSAGE_TYPE;
-import static org.tsugi.basiclti.BasicLTIConstants.TOOL_CONSUMER_INSTANCE_CONTACT_EMAIL;
-import static org.tsugi.basiclti.BasicLTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION;
-import static org.tsugi.basiclti.BasicLTIConstants.TOOL_CONSUMER_INSTANCE_GUID;
-import static org.tsugi.basiclti.BasicLTIConstants.TOOL_CONSUMER_INSTANCE_NAME;
-import static org.tsugi.basiclti.BasicLTIConstants.TOOL_CONSUMER_INSTANCE_URL;
+package org.tsugi.lti;
+
+import static org.tsugi.lti.LTIConstants.LTI_MESSAGE_TYPE_BASICLTILAUNCHREQUEST;
+import static org.tsugi.lti.LTIConstants.LTI_MESSAGE_TYPE_CONTENTITEMSELECTIONREQUEST;
+import static org.tsugi.lti.LTIConstants.LTI_VERSION;
+import static org.tsugi.lti.LTIConstants.LTI_VERSION_1;
+import static org.tsugi.lti.LTIConstants.CUSTOM_PREFIX;
+import static org.tsugi.lti.LTIConstants.LTI_MESSAGE_TYPE;
+import static org.tsugi.lti.LTIConstants.TOOL_CONSUMER_INSTANCE_CONTACT_EMAIL;
+import static org.tsugi.lti.LTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION;
+import static org.tsugi.lti.LTIConstants.TOOL_CONSUMER_INSTANCE_GUID;
+import static org.tsugi.lti.LTIConstants.TOOL_CONSUMER_INSTANCE_NAME;
+import static org.tsugi.lti.LTIConstants.TOOL_CONSUMER_INSTANCE_URL;
 
 import java.util.HashMap;
 import java.util.List;
@@ -102,7 +102,7 @@
  *   &lt;secure_launch_url&gt;url&nbsp;to&nbsp;the&nbsp;basiclti&nbsp;launch&nbsp;URL&lt;/secure_launch_url&gt;
  *   &lt;icon&gt;url&nbsp;to&nbsp;an&nbsp;icon&nbsp;for&nbsp;this&nbsp;tool&nbsp;(optional)&lt;/icon&gt;
  *   &lt;secure_icon&gt;url&nbsp;to&nbsp;an&nbsp;icon&nbsp;for&nbsp;this&nbsp;tool&nbsp;(optional)&lt;/secure_icon&gt;
- *   &lt;cartridge_icon&nbsp;identifierref=&quot;BLTI001_Icon&quot;/&gt;
+ *   &lt;cartridge_icon&nbsp;identifierref=&quot;LTI001_Icon&quot;/&gt;
  *   &lt;vendor&gt;
  *	 &lt;code&gt;vendor.com&lt;/code&gt;
  *	 &lt;name&gt;Vendor&nbsp;Name&lt;/name&gt;
@@ -119,7 +119,7 @@
  */
 
 @Slf4j
-public class BasicLTIUtil {
+public class LTIUtil {
 
 	// How to make ISO8601 Dates
 	// https://stackoverflow.com/questions/2891361/how-to-set-time-zone-of-a-java-util-date
@@ -173,7 +173,7 @@ public static Object validateMessage(HttpServletRequest request, String URL,
 		}
 
 		if ( expected_oauth_key != null && ! expected_oauth_key.equals(oauth_consumer_key) ) {
-			log.warn("BasicLTIUtil.validateMessage Incorrect consumer key={} expected key={}", oauth_consumer_key, expected_oauth_key);
+			log.warn("LTIUtil.validateMessage Incorrect consumer key={} expected key={}", oauth_consumer_key, expected_oauth_key);
 			return "Incorrect consumer key "+oauth_consumer_key;
 		}
 
@@ -251,7 +251,7 @@ public static String adaptToCustomPropertyName(final String propertyName) {
 	 * Add the necessary fields and sign.
 	 *
 	 * @deprecated See:
-	 *	 {@link BasicLTIUtil#signProperties(Map, String, String, String, String, String, String, String, String, String, Map)}
+	 *	 {@link LTIUtil#signProperties(Map, String, String, String, String, String, String, String, String, String, Map)}
 	 *
 	 * @param postProp
 	 * @param url
@@ -275,7 +275,7 @@ public static Properties signProperties(Properties postProp, String url,
 	 * Add the necessary fields and sign.
 	 *
 	 * @deprecated See:
-	 *	 {@link BasicLTIUtil#signProperties(Map, String, String, String, String, String, String, String, String, String, Map)}
+	 *	 {@link LTIUtil#signProperties(Map, String, String, String, String, String, String, String, String, String, Map)}
 	 *
 	 * @param postProp
 	 * @param url
@@ -283,11 +283,11 @@ public static Properties signProperties(Properties postProp, String url,
 	 * @param oauth_consumer_key
 	 * @param oauth_consumer_secret
 	 * @param org_id
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_GUID}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_GUID}
 	 * @param org_desc
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_DESCRIPTION}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_DESCRIPTION}
 	 * @param org_url
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_URL}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_URL}
 	 * @param extra
 	 * @return
 	 */
@@ -310,16 +310,16 @@ public static Properties signProperties(Properties postProp, String url,
 	 * @param oauth_consumer_key
 	 * @param oauth_consumer_secret
 	 * @param tool_consumer_instance_guid
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_GUID}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_GUID}
 	 * @param tool_consumer_instance_description
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_DESCRIPTION}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_DESCRIPTION}
 	 * @param tool_consumer_instance_url
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_URL}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_URL}
 	 * @param tool_consumer_instance_name
-	 *		  See: {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_NAME}
+	 *		  See: {@link LTIConstants#TOOL_CONSUMER_INSTANCE_NAME}
 	 * @param tool_consumer_instance_contact_email
 	 *		  See:
-	 *		  {@link BasicLTIConstants#TOOL_CONSUMER_INSTANCE_CONTACT_EMAIL}
+	 *		  {@link LTIConstants#TOOL_CONSUMER_INSTANCE_CONTACT_EMAIL}
 	 * @param extra
 	 * @return
 	 */
@@ -411,13 +411,13 @@ public static Map<String, String> signProperties(
 			}
 			return nextProp;
 		} catch (net.oauth.OAuthException e) {
-			log.warn("BasicLTIUtil.signProperties OAuth Exception {}", e.getMessage());
+			log.warn("LTIUtil.signProperties OAuth Exception {}", e.getMessage());
 			throw new Error(e);
 		} catch (java.io.IOException e) {
-			log.warn("BasicLTIUtil.signProperties IO Exception {}", e.getMessage());
+			log.warn("LTIUtil.signProperties IO Exception {}", e.getMessage());
 			throw new Error(e);
 		} catch (java.net.URISyntaxException e) {
-			log.warn("BasicLTIUtil.signProperties URI Syntax Exception {}", e.getMessage());
+			log.warn("LTIUtil.signProperties URI Syntax Exception {}", e.getMessage());
 			throw new Error(e);
 		}
 
@@ -427,7 +427,7 @@ public static Map<String, String> signProperties(
 	 * Check if the properties are properly signed
 	 *
 	 * @deprecated See:
-	 *			 {@link BasicLTIUtil#checkProperties(Map, String, String, String, String)}
+	 *			 {@link LTIUtil#checkProperties(Map, String, String, String, String)}
 	 *
 	 * @param postProp
 	 * @param url
@@ -865,7 +865,7 @@ public static boolean parseDescriptor(Properties launch_info,
 		try {
 			tm = XMLMap.getFullMap(descriptor.trim());
 		} catch (Exception e) {
-			log.warn("BasicLTIUtil exception parsing BasicLTI descriptor: {}", e.getMessage());
+			log.warn("LTIUtil exception parsing LTI descriptor: {}", e.getMessage());
 			return false;
 		}
 		if (tm == null) {
@@ -920,7 +920,7 @@ public static boolean parseDescriptor(Map<String, String> launch_info,
 		try {
 			tm = XMLMap.getFullMap(descriptor.trim());
 		} catch (Exception e) {
-			log.warn("BasicLTIUtil exception parsing BasicLTI descriptor: {}", e.getMessage());
+			log.warn("LTIUtil exception parsing LTI descriptor: {}", e.getMessage());
 			return false;
 		}
 		if (tm == null) {
@@ -966,7 +966,7 @@ public static String prepareForExport(String descriptor) {
 		try {
 			tm = XMLMap.getFullMap(descriptor.trim());
 		} catch (Exception e) {
-			log.warn("BasicLTIUtil exception parsing BasicLTI descriptor {}", e.getMessage());
+			log.warn("LTIUtil exception parsing LTI descriptor {}", e.getMessage());
 			return null;
 		}
 		if (tm == null) {
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/XMLMap.java b/lti/tsugi-util/src/java/org/tsugi/lti/XMLMap.java
similarity index 99%
rename from basiclti/tsugi-util/src/java/org/tsugi/basiclti/XMLMap.java
rename to lti/tsugi-util/src/java/org/tsugi/lti/XMLMap.java
index 22c2163689c4..a202e4d26bee 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/XMLMap.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti/XMLMap.java
@@ -19,7 +19,7 @@
  *
  **********************************************************************************/
 
-package org.tsugi.basiclti;
+package org.tsugi.lti;
 
 /* 
  * This is a little project I call mdom.org which stands for "Map-Dom" or "XML Doms in Maps" 
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/DeepLinkResponse.java b/lti/tsugi-util/src/java/org/tsugi/lti13/DeepLinkResponse.java
similarity index 98%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/DeepLinkResponse.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/DeepLinkResponse.java
index 2df65491e1f0..986fdc4ef9ec 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/lti13/DeepLinkResponse.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti13/DeepLinkResponse.java
@@ -29,7 +29,7 @@
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 
 // https://www.imsglobal.org/spec/lti-dl/v2p0
 /*
@@ -241,7 +241,7 @@ public DeepLinkResponse(String id_token)
 		}
 
 		// It is OK for this to be null
-		deep_links = BasicLTIUtil.getArray(body, DEEP_LINKS);
+		deep_links = LTIUtil.getArray(body, DEEP_LINKS);
 
 	}
 	
@@ -315,7 +315,7 @@ public JSONObject getItemOfType(String itemType)
 		for ( Object i : deep_links ) {
 			if ( ! (i instanceof JSONObject) ) continue;
 			JSONObject item = (JSONObject) i;
-			String type = BasicLTIUtil.getString(item,"type");
+			String type = LTIUtil.getString(item,"type");
 			if ( type == null ) continue;
 			if ( type.equals(itemType) ) return item;
 		}
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13AccessTokenUtil.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13AccessTokenUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13AccessTokenUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTI13AccessTokenUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13ConstantsUtil.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13ConstantsUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13ConstantsUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTI13ConstantsUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13JwtUtil.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13JwtUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13JwtUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTI13JwtUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13KeySetUtil.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13KeySetUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13KeySetUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTI13KeySetUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13Servlet.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13Servlet.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13Servlet.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTI13Servlet.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13Util.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13Util.java
similarity index 98%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13Util.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTI13Util.java
index 6336e8fac5f0..22828d7a3045 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTI13Util.java
+++ b/lti/tsugi-util/src/java/org/tsugi/lti13/LTI13Util.java
@@ -37,8 +37,8 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
 
 import org.tsugi.lti13.objects.LaunchJWT;
 import org.tsugi.lti13.objects.LTI11Transition;
@@ -504,12 +504,12 @@ public static void addCustomToLaunch(Properties ltiProps, Properties custom) {
             if (key.startsWith("lti_launch_")) {
                 // sakai internal substitution
                 setProperty(ltiProps,
-                        BasicLTIUtil.mapKeyName(StringUtils.substringAfter(key, "lti_launch_")),
+                        LTIUtil.mapKeyName(StringUtils.substringAfter(key, "lti_launch_")),
                         custom.getProperty(key));
             } else {
                 // sets a custom property
                 setProperty(ltiProps,
-                        BasicLTIConstants.CUSTOM_PREFIX + BasicLTIUtil.mapKeyName(key),
+                        LTIConstants.CUSTOM_PREFIX + LTIUtil.mapKeyName(key),
                         custom.getProperty(key));
             }
         }
@@ -517,7 +517,7 @@ public static void addCustomToLaunch(Properties ltiProps, Properties custom) {
 
 	@SuppressWarnings("deprecation")
     public static void setProperty(Properties props, String key, String value) {
-        BasicLTIUtil.setProperty(props, key, value);
+        LTIUtil.setProperty(props, key, value);
     }
 
     /**
@@ -571,7 +571,7 @@ public static boolean timeStampCheckSign(String token, String secret, int second
     }
 
     public static String toNull(String str) {
-        return BasicLTIUtil.toNull(str);
+        return LTIUtil.toNull(str);
     }
 
     public static int getInt(Object o) {
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/LTICustomVars.java b/lti/tsugi-util/src/java/org/tsugi/lti13/LTICustomVars.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/LTICustomVars.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/LTICustomVars.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/BaseJWT.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/BaseJWT.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/BaseJWT.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/BaseJWT.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/BasicOutcome.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/BasicOutcome.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/BasicOutcome.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/BasicOutcome.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/Context.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/Context.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/Context.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/Context.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/DeepLink.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/DeepLink.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/DeepLink.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/DeepLink.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/Endpoint.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/Endpoint.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/Endpoint.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/Endpoint.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/ForUser.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/ForUser.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/ForUser.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/ForUser.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/GroupService.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/GroupService.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/GroupService.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/GroupService.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTI11Transition.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTI11Transition.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTI11Transition.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTI11Transition.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTILaunchMessage.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTILaunchMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTILaunchMessage.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTILaunchMessage.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIPlatformConfiguration.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIPlatformConfiguration.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIPlatformConfiguration.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIPlatformConfiguration.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIToolConfiguration.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIToolConfiguration.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIToolConfiguration.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LTIToolConfiguration.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchJWT.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchJWT.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchJWT.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchJWT.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchLIS.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchLIS.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchLIS.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchLIS.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchPresentation.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchPresentation.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchPresentation.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/LaunchPresentation.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/NamesAndRoles.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/NamesAndRoles.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/NamesAndRoles.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/NamesAndRoles.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDClientRegistration.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDClientRegistration.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDClientRegistration.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDClientRegistration.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDProviderConfiguration.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDProviderConfiguration.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDProviderConfiguration.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/OpenIDProviderConfiguration.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/ResourceLink.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/ResourceLink.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/ResourceLink.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/ResourceLink.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/ToolPlatform.java b/lti/tsugi-util/src/java/org/tsugi/lti13/objects/ToolPlatform.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/lti13/objects/ToolPlatform.java
rename to lti/tsugi-util/src/java/org/tsugi/lti13/objects/ToolPlatform.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/nrps/objects/Container.java b/lti/tsugi-util/src/java/org/tsugi/nrps/objects/Container.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/nrps/objects/Container.java
rename to lti/tsugi-util/src/java/org/tsugi/nrps/objects/Container.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/nrps/objects/Member.java b/lti/tsugi-util/src/java/org/tsugi/nrps/objects/Member.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/nrps/objects/Member.java
rename to lti/tsugi-util/src/java/org/tsugi/nrps/objects/Member.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/nrps/objects/MemberMessage.java b/lti/tsugi-util/src/java/org/tsugi/nrps/objects/MemberMessage.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/nrps/objects/MemberMessage.java
rename to lti/tsugi-util/src/java/org/tsugi/nrps/objects/MemberMessage.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/oauth2/objects/AccessToken.java b/lti/tsugi-util/src/java/org/tsugi/oauth2/objects/AccessToken.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/oauth2/objects/AccessToken.java
rename to lti/tsugi-util/src/java/org/tsugi/oauth2/objects/AccessToken.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/oauth2/objects/ClientAssertion.java b/lti/tsugi-util/src/java/org/tsugi/oauth2/objects/ClientAssertion.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/oauth2/objects/ClientAssertion.java
rename to lti/tsugi-util/src/java/org/tsugi/oauth2/objects/ClientAssertion.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/pox/IMSPOXRequest.java b/lti/tsugi-util/src/java/org/tsugi/pox/IMSPOXRequest.java
similarity index 99%
rename from basiclti/tsugi-util/src/java/org/tsugi/pox/IMSPOXRequest.java
rename to lti/tsugi-util/src/java/org/tsugi/pox/IMSPOXRequest.java
index 86f04a66fea3..83654eb9de91 100644
--- a/basiclti/tsugi-util/src/java/org/tsugi/pox/IMSPOXRequest.java
+++ b/lti/tsugi-util/src/java/org/tsugi/pox/IMSPOXRequest.java
@@ -22,8 +22,8 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.text.StringEscapeUtils;
-import org.tsugi.basiclti.Base64;
-import org.tsugi.basiclti.XMLMap;
+import org.tsugi.lti.Base64;
+import org.tsugi.lti.XMLMap;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationRequest.java b/lti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationRequest.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationRequest.java
rename to lti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationRequest.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationResponse.java b/lti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationResponse.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationResponse.java
rename to lti/tsugi-util/src/java/org/tsugi/provision/objects/RegistrationResponse.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/shared/objects/Contact.java b/lti/tsugi-util/src/java/org/tsugi/shared/objects/Contact.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/shared/objects/Contact.java
rename to lti/tsugi-util/src/java/org/tsugi/shared/objects/Contact.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/shared/objects/DateRange.java b/lti/tsugi-util/src/java/org/tsugi/shared/objects/DateRange.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/shared/objects/DateRange.java
rename to lti/tsugi-util/src/java/org/tsugi/shared/objects/DateRange.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/shared/objects/SizedUrl.java b/lti/tsugi-util/src/java/org/tsugi/shared/objects/SizedUrl.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/shared/objects/SizedUrl.java
rename to lti/tsugi-util/src/java/org/tsugi/shared/objects/SizedUrl.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/shared/objects/TsugiBase.java b/lti/tsugi-util/src/java/org/tsugi/shared/objects/TsugiBase.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/shared/objects/TsugiBase.java
rename to lti/tsugi-util/src/java/org/tsugi/shared/objects/TsugiBase.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/time/InstantUtil.java b/lti/tsugi-util/src/java/org/tsugi/time/InstantUtil.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/time/InstantUtil.java
rename to lti/tsugi-util/src/java/org/tsugi/time/InstantUtil.java
diff --git a/basiclti/tsugi-util/src/java/org/tsugi/util/Base64DoubleUrlEncodeSafe.java b/lti/tsugi-util/src/java/org/tsugi/util/Base64DoubleUrlEncodeSafe.java
similarity index 100%
rename from basiclti/tsugi-util/src/java/org/tsugi/util/Base64DoubleUrlEncodeSafe.java
rename to lti/tsugi-util/src/java/org/tsugi/util/Base64DoubleUrlEncodeSafe.java
diff --git a/basiclti/tsugi-util/src/main/resources/META-INF/LICENSE b/lti/tsugi-util/src/main/resources/META-INF/LICENSE
similarity index 99%
rename from basiclti/tsugi-util/src/main/resources/META-INF/LICENSE
rename to lti/tsugi-util/src/main/resources/META-INF/LICENSE
index cf04bffdc977..dae983e16fbc 100644
--- a/basiclti/tsugi-util/src/main/resources/META-INF/LICENSE
+++ b/lti/tsugi-util/src/main/resources/META-INF/LICENSE
@@ -204,7 +204,7 @@
 
 ===============================================================================
 
-The LTI Utilities (basiclti-util) distribution includes a number of subcomponents
+The LTI Utilities (lti-util) distribution includes a number of subcomponents
 with separate copyright notices and license terms. Your use of the
 code for the these subcomponents is subject to the terms and
 conditions of the following licenses.
diff --git a/basiclti/tsugi-util/src/main/resources/META-INF/NOTICE b/lti/tsugi-util/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from basiclti/tsugi-util/src/main/resources/META-INF/NOTICE
rename to lti/tsugi-util/src/main/resources/META-INF/NOTICE
diff --git a/basiclti/tsugi-util/src/main/resources/META-INF/README b/lti/tsugi-util/src/main/resources/META-INF/README
similarity index 100%
rename from basiclti/tsugi-util/src/main/resources/META-INF/README
rename to lti/tsugi-util/src/main/resources/META-INF/README
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/HACK/MoodleHackTest.java b/lti/tsugi-util/src/test/org/tsugi/HACK/MoodleHackTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/HACK/MoodleHackTest.java
rename to lti/tsugi-util/src/test/org/tsugi/HACK/MoodleHackTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/contentitem/ContentItemTest.java b/lti/tsugi-util/src/test/org/tsugi/contentitem/ContentItemTest.java
similarity index 99%
rename from basiclti/tsugi-util/src/test/org/tsugi/contentitem/ContentItemTest.java
rename to lti/tsugi-util/src/test/org/tsugi/contentitem/ContentItemTest.java
index 52bf0bd0b5be..be7b82c60138 100644
--- a/basiclti/tsugi-util/src/test/org/tsugi/contentitem/ContentItemTest.java
+++ b/lti/tsugi-util/src/test/org/tsugi/contentitem/ContentItemTest.java
@@ -13,7 +13,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.tsugi.basiclti.ContentItem;
+import org.tsugi.lti.ContentItem;
 import org.tsugi.jackson.JacksonUtil;
 
 import org.tsugi.contentitem.objects.Icon;
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/deeplink/DeepLinkResponseObjectTest.java b/lti/tsugi-util/src/test/org/tsugi/deeplink/DeepLinkResponseObjectTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/deeplink/DeepLinkResponseObjectTest.java
rename to lti/tsugi-util/src/test/org/tsugi/deeplink/DeepLinkResponseObjectTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/http/HttpUtilTest.java b/lti/tsugi-util/src/test/org/tsugi/http/HttpUtilTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/http/HttpUtilTest.java
rename to lti/tsugi-util/src/test/org/tsugi/http/HttpUtilTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/jackson/JacksonUtilTest.java b/lti/tsugi-util/src/test/org/tsugi/jackson/JacksonUtilTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/jackson/JacksonUtilTest.java
rename to lti/tsugi-util/src/test/org/tsugi/jackson/JacksonUtilTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/jackson/objects/JacksonBaseTest.java b/lti/tsugi-util/src/test/org/tsugi/jackson/objects/JacksonBaseTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/jackson/objects/JacksonBaseTest.java
rename to lti/tsugi-util/src/test/org/tsugi/jackson/objects/JacksonBaseTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/basiclti/BasicLTIUtilTest.java b/lti/tsugi-util/src/test/org/tsugi/lti/LTIUtilTest.java
similarity index 68%
rename from basiclti/tsugi-util/src/test/org/tsugi/basiclti/BasicLTIUtilTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti/LTIUtilTest.java
index 71f2045ce9b8..c103c691b710 100644
--- a/basiclti/tsugi-util/src/test/org/tsugi/basiclti/BasicLTIUtilTest.java
+++ b/lti/tsugi-util/src/test/org/tsugi/lti/LTIUtilTest.java
@@ -1,9 +1,9 @@
-package org.tsugi.basiclti;
+package org.tsugi.lti;
 import static org.junit.Assert.*;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_MESSAGE_TYPE;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_MESSAGE_TYPE_BASICLTILAUNCHREQUEST;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_VERSION;
-import static org.tsugi.basiclti.BasicLTIConstants.LTI_VERSION_1;
+import static org.tsugi.lti.LTIConstants.LTI_MESSAGE_TYPE;
+import static org.tsugi.lti.LTIConstants.LTI_MESSAGE_TYPE_BASICLTILAUNCHREQUEST;
+import static org.tsugi.lti.LTIConstants.LTI_VERSION;
+import static org.tsugi.lti.LTIConstants.LTI_VERSION_1;
 
 import net.oauth.OAuth;
 import net.oauth.OAuthMessage;
@@ -29,7 +29,7 @@
 import org.apache.commons.text.StringEscapeUtils;
 
 @Slf4j
-public class BasicLTIUtilTest {
+public class LTIUtilTest {
 
 	@Before
 	public void setUp() throws Exception {
@@ -37,15 +37,15 @@ public void setUp() throws Exception {
 
 	@Test
 	public void testGetRealPath() {
-		String fixed = BasicLTIUtil.getRealPath("http://localhost/path/blah/", "https://right.com");
+		String fixed = LTIUtil.getRealPath("http://localhost/path/blah/", "https://right.com");
 		assertEquals("https://right.com/path/blah/",fixed);
-		fixed = BasicLTIUtil.getRealPath("https://localhost/path/blah/", "https://right.com");
+		fixed = LTIUtil.getRealPath("https://localhost/path/blah/", "https://right.com");
 		assertEquals("https://right.com/path/blah/",fixed);
-		fixed = BasicLTIUtil.getRealPath("https://localhost/path/blah/", "http://right.com");
+		fixed = LTIUtil.getRealPath("https://localhost/path/blah/", "http://right.com");
 		assertEquals("http://right.com/path/blah/",fixed);
 
 		// Test folks sending in URL with extra stuff...
-		fixed = BasicLTIUtil.getRealPath("https://localhost/path/blah/", "https://right.com/path/blah");
+		fixed = LTIUtil.getRealPath("https://localhost/path/blah/", "https://right.com/path/blah");
 		assertEquals("https://right.com/path/blah/",fixed);
 	}
 
@@ -54,42 +54,42 @@ public void testGetRealPathRequest() {
 		HttpServletRequest req = Mockito.mock(HttpServletRequest.class);
 
 		Mockito.when(req.getRequestURL()).thenReturn(new StringBuffer("http://localhost/path/blah/"));
-		String fixed = BasicLTIUtil.getRealPath(req, "https://right.com");
+		String fixed = LTIUtil.getRealPath(req, "https://right.com");
 		assertEquals("https://right.com/path/blah/", fixed);
 
 		Mockito.when(req.getRequestURL()).thenReturn(new StringBuffer("https://localhost/path/blah/"));
-		fixed = BasicLTIUtil.getRealPath(req, "https://right.com");
+		fixed = LTIUtil.getRealPath(req, "https://right.com");
 		assertEquals("https://right.com/path/blah/", fixed);
 
 		Mockito.when(req.getRequestURL()).thenReturn(new StringBuffer("https://localhost/path/blah/"));
-		fixed = BasicLTIUtil.getRealPath(req, "http://right.com");
+		fixed = LTIUtil.getRealPath(req, "http://right.com");
 		assertEquals("http://right.com/path/blah/", fixed);
 
 		Mockito.when(req.getRequestURL()).thenReturn(new StringBuffer("http://localhost/path/blah/"));
-		fixed = BasicLTIUtil.getRealPath(req, "https://right.com/path/blah");
+		fixed = LTIUtil.getRealPath(req, "https://right.com/path/blah");
 		assertEquals("https://right.com/path/blah/", fixed);
 	}
 
 	@Test
 	public void testOAuthGET()
 	{
-		String url = BasicLTIUtil.getOAuthURL("GET", "http://www.dr-chuck.com/page1.htm?x=1", "12345", "secret");
+		String url = LTIUtil.getOAuthURL("GET", "http://www.dr-chuck.com/page1.htm?x=1", "12345", "secret");
 		log.debug("url={}", url);
 		assertTrue(url.contains("oauth_consumer_key"));
 		assertTrue(url.contains("oauth_signature="));
 		assertTrue(url.contains("www.dr-chuck.com"));
 
-		url = BasicLTIUtil.getOAuthURL("GET", null, null, null);
+		url = LTIUtil.getOAuthURL("GET", null, null, null);
 		log.debug("url={}", url);
 		assertNull(url);
 
 		/*
 		// Comment this test out int trunk as it requires the network to be up...
-		HttpURLConnection connection = BasicLTIUtil.sendOAuthURL("GET", "http://www.dr-chuck.com/dump.php?x=1", "12345", "secret");
+		HttpURLConnection connection = LTIUtil.sendOAuthURL("GET", "http://www.dr-chuck.com/dump.php?x=1", "12345", "secret");
 		try { int responseCode = connection.getResponseCode();
 			log.debug("Responsecode={}", responseCode);
 		} catch(Exception e) { }
-		String data = BasicLTIUtil.readHttpResponse(connection);
+		String data = LTIUtil.readHttpResponse(connection);
 		log.debug("data={}", data);
 		// End of test with network required
 		*/
@@ -97,7 +97,7 @@ public void testOAuthGET()
 
 	@Test
 	public void iso8601Text() throws Exception {
-		String x = BasicLTIUtil.getISO8601();
+		String x = LTIUtil.getISO8601();
 		assertTrue(x.contains("Z"));
 		assertTrue(x.contains("T"));
 		String target = "2017-08-20:10:00:00";
@@ -106,15 +106,15 @@ public void iso8601Text() throws Exception {
 		DateFormat df = new SimpleDateFormat("yyyy-mm-dd:hh:mm:ss");
 				df.setTimeZone(TimeZone.getTimeZone("GMT"));
 		Date result = df.parse(target);
-		String y = BasicLTIUtil.getISO8601(result);
+		String y = LTIUtil.getISO8601(result);
 		assertEquals(y,iso8601);
 
 		// Now lets parse some iso dates
-		result = BasicLTIUtil.parseIMS8601(iso8601);
-		String z = BasicLTIUtil.getISO8601(result);
+		result = LTIUtil.parseIMS8601(iso8601);
+		String z = LTIUtil.getISO8601(result);
 		assertEquals(z, iso8601);
 
-		result = BasicLTIUtil.parseIMS8601(null);
+		result = LTIUtil.parseIMS8601(null);
 		assertNull(result);
 
 		String[] variations = {
@@ -131,8 +131,8 @@ public void iso8601Text() throws Exception {
 		};
 
 		for(int i=0; i<variations.length; i++) {
-			result = BasicLTIUtil.parseIMS8601(variations[i]);
-			z = BasicLTIUtil.getISO8601(result);
+			result = LTIUtil.parseIMS8601(variations[i]);
+			z = LTIUtil.getISO8601(result);
 			assertEquals(z, iso8601);
 		}
 	}
@@ -142,24 +142,24 @@ public void isRequest() {
 		HttpServletRequest req = Mockito.mock(HttpServletRequest.class);
 
 		//Nothing set = bad request
-		boolean isReq = BasicLTIUtil.isRequest(req);
+		boolean isReq = LTIUtil.isRequest(req);
 		assertFalse(isReq);
 
 		//Set both things = good request
 		Mockito.when(req.getParameter(LTI_MESSAGE_TYPE)).thenReturn(LTI_MESSAGE_TYPE_BASICLTILAUNCHREQUEST);
 		Mockito.when(req.getParameter(LTI_VERSION)).thenReturn(LTI_VERSION_1);
-		isReq = BasicLTIUtil.isRequest(req);
+		isReq = LTIUtil.isRequest(req);
 		assertTrue(isReq);
 
 		//Bad message type = bad request
 		Mockito.when(req.getParameter(LTI_MESSAGE_TYPE)).thenReturn("foobar");
-		isReq = BasicLTIUtil.isRequest(req);
+		isReq = LTIUtil.isRequest(req);
 		assertFalse(isReq);
 
 		//Bad version = bad request
 		Mockito.when(req.getParameter(LTI_MESSAGE_TYPE)).thenReturn(LTI_MESSAGE_TYPE_BASICLTILAUNCHREQUEST);
 		Mockito.when(req.getParameter(LTI_VERSION)).thenReturn("taco");
-		isReq = BasicLTIUtil.isRequest(req);
+		isReq = LTIUtil.isRequest(req);
 		assertFalse(isReq);
 	}
 
@@ -175,7 +175,7 @@ public void validateMessageIncorrectConsumerKey() {
 		String secret = "shhh";
 		String key = "zuul2";
 
-		Object obj = BasicLTIUtil.validateMessage(req, url, secret, key);
+		Object obj = LTIUtil.validateMessage(req, url, secret, key);
 		assertEquals("Incorrect consumer key zuul", obj);
 	}
 
@@ -192,7 +192,7 @@ public void validateMessageNoBaseString() {
 		String secret = "shhh";
 		String key = "zuul";
 
-		Object obj = BasicLTIUtil.validateMessage(req, url, secret, key);
+		Object obj = LTIUtil.validateMessage(req, url, secret, key);
 		assertEquals("Unable to find base string", obj);
 	}
 
@@ -204,7 +204,7 @@ public void validateGoodMessage() {
 		String secret = "shhh";
 		String key = "zuul";
 
-		Map<String, String> signedParams_pre = BasicLTIUtil.signProperties(paramMap, url, OAuthMessage.POST, key, secret,
+		Map<String, String> signedParams_pre = LTIUtil.signProperties(paramMap, url, OAuthMessage.POST, key, secret,
 				"guid", "desc", "tool_url",
 				"name", "email", null);
 
@@ -218,27 +218,27 @@ public void validateGoodMessage() {
 		Mockito.when(req.getParameterMap()).thenReturn(signedParams);
 		Mockito.when(req.getMethod()).thenReturn(OAuthMessage.POST);
 
-		Object obj = BasicLTIUtil.validateMessage(req, url, secret, key);
+		Object obj = LTIUtil.validateMessage(req, url, secret, key);
 		assertEquals(Boolean.TRUE, obj);
 	}
 
 	@Test
 	public void validateDescriptorBad() throws Exception {
-		String valid = BasicLTIUtil.validateDescriptor(null);
+		String valid = LTIUtil.validateDescriptor(null);
 		assertNull(valid);
 
-		valid = BasicLTIUtil.validateDescriptor("garbage");
+		valid = LTIUtil.validateDescriptor("garbage");
 		assertNull(valid);
 
 		//Validate a descriptor that has no launch urls
 		InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor_no_launch.xml");
 		String fileContents = IOUtils.toString(resourceAsStream, "UTF-8");
-		valid = BasicLTIUtil.validateDescriptor(fileContents);
+		valid = LTIUtil.validateDescriptor(fileContents);
 		assertNull(valid);
 
 		resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor_empty_base_tag.xml");
 		fileContents = IOUtils.toString(resourceAsStream, "UTF-8");
-		valid = BasicLTIUtil.validateDescriptor(fileContents);
+		valid = LTIUtil.validateDescriptor(fileContents);
 		assertNull(valid);
 	}
 
@@ -247,41 +247,41 @@ public void validateDescriptor() throws Exception {
 		//Validate a descriptor with a secure launch
 		InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor_secure.xml");
 		String fileContents = IOUtils.toString(resourceAsStream, "UTF-8");
-		String valid = BasicLTIUtil.validateDescriptor(fileContents);
+		String valid = LTIUtil.validateDescriptor(fileContents);
 		assertEquals("secure url to the basiclti launch URL", valid);
 
 		//Validate a descriptor with a regular launch
 		resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor.xml");
 		fileContents = IOUtils.toString(resourceAsStream, "UTF-8");
-		valid = BasicLTIUtil.validateDescriptor(fileContents);
+		valid = LTIUtil.validateDescriptor(fileContents);
 		assertEquals("url to the basiclti launch URL", valid);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void adaptToCustomPropertyNameNull() {
-		BasicLTIUtil.adaptToCustomPropertyName(null);
+		LTIUtil.adaptToCustomPropertyName(null);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void adaptToCustomPropertyNameEmpty() {
-		BasicLTIUtil.adaptToCustomPropertyName("");
+		LTIUtil.adaptToCustomPropertyName("");
 	}
 
 	@Test
 	public void adaptToCustomPropertyName() {
-		String newPropName = BasicLTIUtil.adaptToCustomPropertyName("foobar");
+		String newPropName = LTIUtil.adaptToCustomPropertyName("foobar");
 		assertEquals("custom_foobar", newPropName);
 	}
 
 	@Test
 	public void parseDescriptorNulls() throws Exception {
-		boolean parsed = BasicLTIUtil.parseDescriptor(new HashMap(), null, null);
+		boolean parsed = LTIUtil.parseDescriptor(new HashMap(), null, null);
 		assertFalse(parsed);
 
 		InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor_empty.xml");
 		String descriptor = IOUtils.toString(resourceAsStream, "UTF-8");
 
-		parsed = BasicLTIUtil.parseDescriptor(new HashMap(), new HashMap(), descriptor);
+		parsed = LTIUtil.parseDescriptor(new HashMap(), new HashMap(), descriptor);
 		assertFalse(parsed);
 	}
 
@@ -293,7 +293,7 @@ public void parseDescriptorNoLaunch() throws Exception {
 		Map<String, String> launchMap = new HashMap<>();
 		Map<String, String> postPropMap = new HashMap<>();
 
-		boolean parsed = BasicLTIUtil.parseDescriptor(launchMap, postPropMap, descriptor);
+		boolean parsed = LTIUtil.parseDescriptor(launchMap, postPropMap, descriptor);
 		assertFalse(parsed);
 	}
 
@@ -305,13 +305,13 @@ public void parseDescriptor() throws Exception {
 		Map<String, String> launchMap = new HashMap<>();
 		Map<String, String> postPropMap = new HashMap<>();
 
-		boolean parsed = BasicLTIUtil.parseDescriptor(launchMap, postPropMap, descriptor);
+		boolean parsed = LTIUtil.parseDescriptor(launchMap, postPropMap, descriptor);
 		assertTrue(parsed);
 	}
 
 	@Test
 	public void prepareForExport() throws Exception {
-		String forExport = BasicLTIUtil.prepareForExport(null);
+		String forExport = LTIUtil.prepareForExport(null);
 		assertNull(forExport);
 
 		InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor_secure.xml");
@@ -319,52 +319,52 @@ public void prepareForExport() throws Exception {
 
 		assertTrue(descriptor.contains("x-secure"));
 
-		forExport = BasicLTIUtil.prepareForExport(descriptor);
+		forExport = LTIUtil.prepareForExport(descriptor);
 		assertFalse(forExport.contains("x-secure"));
 
 		resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("descriptor_empty.xml");
 		descriptor = IOUtils.toString(resourceAsStream, "UTF-8");
 
-		forExport = BasicLTIUtil.prepareForExport(descriptor);
+		forExport = LTIUtil.prepareForExport(descriptor);
 		assertNull(forExport);
 	}
 
 	@Test
 	public void mapKeyName() {
-		String keyName = BasicLTIUtil.mapKeyName("Vendor:Chapter");
+		String keyName = LTIUtil.mapKeyName("Vendor:Chapter");
 		assertEquals("vendor_chapter", keyName);
 
-		keyName = BasicLTIUtil.mapKeyName("ASDF:1234&asdf.1qaz");
+		keyName = LTIUtil.mapKeyName("ASDF:1234&asdf.1qaz");
 		assertEquals("asdf_1234_asdf_1qaz", keyName);
 
-		keyName = BasicLTIUtil.mapKeyName("foobar");
+		keyName = LTIUtil.mapKeyName("foobar");
 		assertEquals("foobar", keyName);
 
-		keyName = BasicLTIUtil.mapKeyName("El Ni·ño");
+		keyName = LTIUtil.mapKeyName("El Ni·ño");
 		assertEquals("el_ni_ño", keyName);
 
-		keyName = BasicLTIUtil.mapKeyName(null);
+		keyName = LTIUtil.mapKeyName(null);
 		assertNull(keyName);
 
-		keyName = BasicLTIUtil.mapKeyName("");
+		keyName = LTIUtil.mapKeyName("");
 		assertNull(keyName);
 	}
 
 	@Test
 	public void toNull() {
-		String result = BasicLTIUtil.toNull(null);
+		String result = LTIUtil.toNull(null);
 		assertNull(result);
 
-		result = BasicLTIUtil.toNull("");
+		result = LTIUtil.toNull("");
 		assertNull(result);
 
-		result = BasicLTIUtil.toNull(" ");
+		result = LTIUtil.toNull(" ");
 		assertNull(result);
 
-		result = BasicLTIUtil.toNull("   ");
+		result = LTIUtil.toNull("   ");
 		assertNull(result);
 
-		result = BasicLTIUtil.toNull("foobar");
+		result = LTIUtil.toNull("foobar");
 		assertNotNull(result);
 		assertEquals("foobar", result);
 	}
@@ -373,37 +373,37 @@ public void toNull() {
 	public void setProperty() {
 		Map<String, String> theMap = new HashMap<>();
 
-		BasicLTIUtil.setProperty(theMap, "foo", "bar");
+		LTIUtil.setProperty(theMap, "foo", "bar");
 		assertEquals(1, theMap.size());
 		assertTrue(theMap.containsKey("foo"));
 		assertEquals("bar", theMap.get("foo"));
 
-		BasicLTIUtil.setProperty(theMap, "foo", "qwerty");
+		LTIUtil.setProperty(theMap, "foo", "qwerty");
 		assertEquals(1, theMap.size());
 		assertTrue(theMap.containsKey("foo"));
 		assertEquals("qwerty", theMap.get("foo"));
 
-		BasicLTIUtil.setProperty(theMap, "foo", "");
+		LTIUtil.setProperty(theMap, "foo", "");
 		assertEquals(1, theMap.size());
 		assertTrue(theMap.containsKey("foo"));
 		assertEquals("qwerty", theMap.get("foo"));
 
-		BasicLTIUtil.setProperty(theMap, "lms", "sakai");
+		LTIUtil.setProperty(theMap, "lms", "sakai");
 		assertEquals(2, theMap.size());
 		assertTrue(theMap.containsKey("lms"));
 		assertEquals("sakai", theMap.get("lms"));
 
-		BasicLTIUtil.setProperty(theMap, "", "?");
+		LTIUtil.setProperty(theMap, "", "?");
 		assertEquals(3, theMap.size());
 		assertTrue(theMap.containsKey(""));
 		assertEquals("?", theMap.get(""));
 
-		BasicLTIUtil.setProperty(theMap, "asdf", null);
+		LTIUtil.setProperty(theMap, "asdf", null);
 		assertEquals(3, theMap.size());
 		assertFalse(theMap.containsKey("asdf"));
 		assertNull(theMap.get("asdf"));
 
-		BasicLTIUtil.setProperty(theMap, null, "no boom");
+		LTIUtil.setProperty(theMap, null, "no boom");
 		assertEquals(4, theMap.size());
 		assertTrue(theMap.containsKey(null));
 		assertEquals("no boom", theMap.get(null));
@@ -412,21 +412,21 @@ public void setProperty() {
 	@Test
 	public void htmlspecialchars() {
 		String input = "<hi & \"bye' = ><hi & \"bye' = >";
-		String result = BasicLTIUtil.htmlspecialchars(input);
+		String result = LTIUtil.htmlspecialchars(input);
 		assertEquals("&lt;hi &amp; &quot;bye' = &gt;&lt;hi &amp; &quot;bye' = &gt;", result);
 		String roundtrip = StringEscapeUtils.unescapeHtml4(result);
 		assertEquals(input, roundtrip);
 
 		input = "one line\r\ntwo line\r\n";
-		result = BasicLTIUtil.htmlspecialchars(input);
+		result = LTIUtil.htmlspecialchars(input);
 		assertEquals("one line&#13;&#10;two line&#13;&#10;", result);
 		roundtrip = StringEscapeUtils.unescapeHtml4(result);
 		assertEquals(input, roundtrip);
 
-		result = BasicLTIUtil.htmlspecialchars("nothing to see here");
+		result = LTIUtil.htmlspecialchars("nothing to see here");
 		assertEquals("nothing to see here", result);
 
-		result = BasicLTIUtil.htmlspecialchars(null);
+		result = LTIUtil.htmlspecialchars(null);
 		assertNull(result);
 	}
 
@@ -437,7 +437,7 @@ public void convertToMap() {
 		props.setProperty("lms", "Sakai");
 		props.setProperty("", "something");
 
-		Map<String, String> results = BasicLTIUtil.convertToMap(props);
+		Map<String, String> results = LTIUtil.convertToMap(props);
 		assertNotNull(results);
 		assertEquals(3, results.size());
 		assertEquals("bar", results.get("foo"));
@@ -448,38 +448,38 @@ public void convertToMap() {
 
 	@Test
 	public void isBlank() {
-		assertTrue(BasicLTIUtil.isBlank(null));
-		assertTrue(BasicLTIUtil.isBlank(""));
-		assertTrue(BasicLTIUtil.isBlank(" "));
-		assertFalse(BasicLTIUtil.isBlank("bob"));
-		assertFalse(BasicLTIUtil.isBlank(" bob "));
+		assertTrue(LTIUtil.isBlank(null));
+		assertTrue(LTIUtil.isBlank(""));
+		assertTrue(LTIUtil.isBlank(" "));
+		assertFalse(LTIUtil.isBlank("bob"));
+		assertFalse(LTIUtil.isBlank(" bob "));
 	}
 
 	@Test
 	public void isNotBlank() {
-		assertFalse(BasicLTIUtil.isNotBlank(null));
-		assertFalse(BasicLTIUtil.isNotBlank(""));
-		assertFalse(BasicLTIUtil.isNotBlank(" "));
-		assertTrue(BasicLTIUtil.isNotBlank("bob"));
-		assertTrue(BasicLTIUtil.isNotBlank(" bob "));
+		assertFalse(LTIUtil.isNotBlank(null));
+		assertFalse(LTIUtil.isNotBlank(""));
+		assertFalse(LTIUtil.isNotBlank(" "));
+		assertTrue(LTIUtil.isNotBlank("bob"));
+		assertTrue(LTIUtil.isNotBlank(" bob "));
 	}
 
 	@Test
 	public void equals() {
-		assertTrue(BasicLTIUtil.equals(null, null));
-		assertFalse(BasicLTIUtil.equals(null, "abc"));
-		assertFalse(BasicLTIUtil.equals("abc", null));
-		assertTrue(BasicLTIUtil.equals("abc", "abc"));
-		assertFalse(BasicLTIUtil.equals("abc", "ABC"));
+		assertTrue(LTIUtil.equals(null, null));
+		assertFalse(LTIUtil.equals(null, "abc"));
+		assertFalse(LTIUtil.equals("abc", null));
+		assertTrue(LTIUtil.equals("abc", "abc"));
+		assertFalse(LTIUtil.equals("abc", "ABC"));
 	}
 
 	@Test
 	public void equalsIgnoreCase() {
-		assertTrue(BasicLTIUtil.equalsIgnoreCase(null, null));
-		assertFalse(BasicLTIUtil.equalsIgnoreCase(null, "abc"));
-		assertFalse(BasicLTIUtil.equalsIgnoreCase("abc", null));
-		assertTrue(BasicLTIUtil.equalsIgnoreCase("abc", "abc"));
-		assertTrue(BasicLTIUtil.equalsIgnoreCase("abc", "ABC"));
+		assertTrue(LTIUtil.equalsIgnoreCase(null, null));
+		assertFalse(LTIUtil.equalsIgnoreCase(null, "abc"));
+		assertFalse(LTIUtil.equalsIgnoreCase("abc", null));
+		assertTrue(LTIUtil.equalsIgnoreCase("abc", "abc"));
+		assertTrue(LTIUtil.equalsIgnoreCase("abc", "ABC"));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -488,7 +488,7 @@ public void postLaunchHtmlEmptyMap() {
 		String endpoint = "";
 		String launchtext = "";
 		Map<String, String> extra = new HashMap<>();
-		BasicLTIUtil.postLaunchHTML(props, endpoint, launchtext, true, extra);
+		LTIUtil.postLaunchHTML(props, endpoint, launchtext, true, extra);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -498,7 +498,7 @@ public void postLaunchHtmlEmptyEndpoint() {
 		String endpoint = null;
 		String launchtext = "";
 		Map<String, String> extra = new HashMap<>();
-		BasicLTIUtil.postLaunchHTML(props, endpoint, launchtext, true, extra);
+		LTIUtil.postLaunchHTML(props, endpoint, launchtext, true, extra);
 	}
 
 	@Test
@@ -511,27 +511,27 @@ public void postLaunchHtml() {
 		Map<String, String> extra = new HashMap<>();
 		extra.put("foo", "bar");
 		extra.put("BaseString", "base string");
-		String html = BasicLTIUtil.postLaunchHTML(props, endpoint, launchtext, false, extra);
+		String html = LTIUtil.postLaunchHTML(props, endpoint, launchtext, false, extra);
 		assertNotNull(html);
 
-		html = BasicLTIUtil.postLaunchHTML(props, endpoint, launchtext, true, extra);
+		html = LTIUtil.postLaunchHTML(props, endpoint, launchtext, true, extra);
 		assertNotNull(html);
 	}
 
 	@Test
 	public void checkProperties() {
 		Map<String, String> props = new HashMap<>();
-		boolean checkedProperties = BasicLTIUtil.checkProperties(props, "https://www.sakailms.org/", "POST",
+		boolean checkedProperties = LTIUtil.checkProperties(props, "https://www.sakailms.org/", "POST",
 				"key", "secret");
 		assertFalse(checkedProperties);
 
 		String url = "https://www.sakailms.org/";
 		String key = "key";
 		String secret = "secret";
-		Map<String, String> signedParams = BasicLTIUtil.signProperties(props, url, OAuthMessage.POST, key, secret,
+		Map<String, String> signedParams = LTIUtil.signProperties(props, url, OAuthMessage.POST, key, secret,
 				"guid", "desc", "tool_url",
 				"name", "email", null);
-		checkedProperties = BasicLTIUtil.checkProperties(signedParams, url, OAuthMessage.POST,
+		checkedProperties = LTIUtil.checkProperties(signedParams, url, OAuthMessage.POST,
 				key, secret);
 		assertTrue(checkedProperties);
 	}
@@ -544,12 +544,12 @@ public void signProperties() {
 		String url = "https://www.sakailms.org/";
 		String key = "key";
 		String secret = "secret";
-		Map<String, String> signedParams = BasicLTIUtil.signProperties(props, url, OAuthMessage.POST, key, secret,
+		Map<String, String> signedParams = LTIUtil.signProperties(props, url, OAuthMessage.POST, key, secret,
 				"guid", "desc", "tool_url",
 				"name", "email", extra);
 		assertNotNull(signedParams);
 
-		signedParams = BasicLTIUtil.signProperties(props, url, OAuthMessage.GET, null, secret,
+		signedParams = LTIUtil.signProperties(props, url, OAuthMessage.GET, null, secret,
 				"guid", "desc", "tool_url",
 				"name", "email", extra);
 		assertNotNull(signedParams);
@@ -557,15 +557,15 @@ public void signProperties() {
 
 	@Test
 	public void testMergeCSV() {
-		String retval = BasicLTIUtil.mergeCSV("1,2,3", null, "4");
+		String retval = LTIUtil.mergeCSV("1,2,3", null, "4");
 		assertEquals(retval, "1,2,3,4");
-		retval = BasicLTIUtil.mergeCSV("1,2", "3", "4");
+		retval = LTIUtil.mergeCSV("1,2", "3", "4");
 		assertEquals(retval, "1,2,3,4");
-		retval = BasicLTIUtil.mergeCSV("1,2", "1,2,3,4", "4");
+		retval = LTIUtil.mergeCSV("1,2", "1,2,3,4", "4");
 		assertEquals(retval, "1,2,3,4");
-		retval = BasicLTIUtil.mergeCSV("1,2", "1,2,3,4", null);
+		retval = LTIUtil.mergeCSV("1,2", "1,2,3,4", null);
 		assertEquals(retval, "1,2,3,4");
-		retval = BasicLTIUtil.mergeCSV("1,2", "2,1,3,4", null);
+		retval = LTIUtil.mergeCSV("1,2", "2,1,3,4", null);
 		assertEquals(retval, "1,2,3,4");
 	}
 
@@ -590,8 +590,8 @@ public void testShiftJVMDateToTimeZone() {
 		// It does mean that late points are best computed in the controlling LMS, not the
 		// LTI/SakaiPlus system
 		Date dueDate = new Date("Wed Jan 18 15:00:00 2023");
-		Date eastDate = BasicLTIUtil.shiftJVMDateToTimeZone(dueDate, "US/Eastern");
-		Date mountainDate = BasicLTIUtil.shiftJVMDateToTimeZone(dueDate, "America/Denver");
+		Date eastDate = LTIUtil.shiftJVMDateToTimeZone(dueDate, "US/Eastern");
+		Date mountainDate = LTIUtil.shiftJVMDateToTimeZone(dueDate, "America/Denver");
 		assertEquals(eastDate.getTime(), mountainDate.getTime()+2*60*60*1000);
 	}
 
@@ -600,7 +600,7 @@ public void testShiftJVMDateToTimeZone() {
 	public void testEscapeNewlinesAndCarriageReturns() {
 		String input = "This is a line with newlines.\r\nHere is another line.\rAnd another one.\n";
 		String expected = "This is a line with newlines.\\r\\nHere is another line.\\rAnd another one.\\n";
-		String actual = BasicLTIUtil.escapeSpecialCharacters(input);
+		String actual = LTIUtil.escapeSpecialCharacters(input);
 		assertEquals(expected, actual);
 	}
 
@@ -608,7 +608,7 @@ public void testEscapeNewlinesAndCarriageReturns() {
 	public void testEscapeTabsAndBackslash() {
 		String input = "This \tis \ta \tstring \twith \t\ttabs \\and backslashes \\";
 		String expected = "This \\tis \\ta \\tstring \\twith \\t\\ttabs \\\\and backslashes \\\\";
-		String actual = BasicLTIUtil.escapeSpecialCharacters(input);
+		String actual = LTIUtil.escapeSpecialCharacters(input);
 		assertEquals(expected, actual);
 	}
 }
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/GroupServiceTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/GroupServiceTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/GroupServiceTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/GroupServiceTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13AccessTokenUtilTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13AccessTokenUtilTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13AccessTokenUtilTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13AccessTokenUtilTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13JJWTTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13JJWTTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13JJWTTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13JJWTTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13JavaTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13JavaTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13JavaTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13JavaTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13KeySetTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13KeySetTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13KeySetTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13KeySetTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13NimbusTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13NimbusTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13NimbusTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13NimbusTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13ObjectTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13ObjectTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13ObjectTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13ObjectTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13PKITest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13PKITest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13PKITest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13PKITest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/lti13/LaunchJWTTest.java b/lti/tsugi-util/src/test/org/tsugi/lti13/LaunchJWTTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/lti13/LaunchJWTTest.java
rename to lti/tsugi-util/src/test/org/tsugi/lti13/LaunchJWTTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/nrps/NRPSTest.java b/lti/tsugi-util/src/test/org/tsugi/nrps/NRPSTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/nrps/NRPSTest.java
rename to lti/tsugi-util/src/test/org/tsugi/nrps/NRPSTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java b/lti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java
rename to lti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/time/InstantUtilTest.java b/lti/tsugi-util/src/test/org/tsugi/time/InstantUtilTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/time/InstantUtilTest.java
rename to lti/tsugi-util/src/test/org/tsugi/time/InstantUtilTest.java
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/util/Base64DoubleUrlEncodeSafeTest.java b/lti/tsugi-util/src/test/org/tsugi/util/Base64DoubleUrlEncodeSafeTest.java
similarity index 100%
rename from basiclti/tsugi-util/src/test/org/tsugi/util/Base64DoubleUrlEncodeSafeTest.java
rename to lti/tsugi-util/src/test/org/tsugi/util/Base64DoubleUrlEncodeSafeTest.java
diff --git a/basiclti/tsugi-util/src/test/resources/deeplink/deep_link_settings.json b/lti/tsugi-util/src/test/resources/deeplink/deep_link_settings.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/deeplink/deep_link_settings.json
rename to lti/tsugi-util/src/test/resources/deeplink/deep_link_settings.json
diff --git a/basiclti/tsugi-util/src/test/resources/deeplink/sample_ltiresourcelink.json b/lti/tsugi-util/src/test/resources/deeplink/sample_ltiresourcelink.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/deeplink/sample_ltiresourcelink.json
rename to lti/tsugi-util/src/test/resources/deeplink/sample_ltiresourcelink.json
diff --git a/basiclti/tsugi-util/src/test/resources/deeplink/sample_response.json b/lti/tsugi-util/src/test/resources/deeplink/sample_response.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/deeplink/sample_response.json
rename to lti/tsugi-util/src/test/resources/deeplink/sample_response.json
diff --git a/basiclti/tsugi-util/src/test/resources/descriptor.xml b/lti/tsugi-util/src/test/resources/descriptor.xml
similarity index 95%
rename from basiclti/tsugi-util/src/test/resources/descriptor.xml
rename to lti/tsugi-util/src/test/resources/descriptor.xml
index bb810f7a9d71..9495734358af 100644
--- a/basiclti/tsugi-util/src/test/resources/descriptor.xml
+++ b/lti/tsugi-util/src/test/resources/descriptor.xml
@@ -12,7 +12,7 @@
     <launch_url>url to the basiclti launch URL</launch_url>
     <icon>url to an icon for this tool (optional)</icon>
     <secure_icon>url to an icon for this tool (optional)</secure_icon>
-    <cartridge_icon identifierref="BLTI001_Icon"/>
+    <cartridge_icon identifierref="LTI001_Icon"/>
     <vendor>
         <code>vendor.com</code>
         <name>Vendor Name</name>
diff --git a/basiclti/tsugi-util/src/test/resources/descriptor_empty.xml b/lti/tsugi-util/src/test/resources/descriptor_empty.xml
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/descriptor_empty.xml
rename to lti/tsugi-util/src/test/resources/descriptor_empty.xml
diff --git a/basiclti/tsugi-util/src/test/resources/descriptor_empty_base_tag.xml b/lti/tsugi-util/src/test/resources/descriptor_empty_base_tag.xml
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/descriptor_empty_base_tag.xml
rename to lti/tsugi-util/src/test/resources/descriptor_empty_base_tag.xml
diff --git a/basiclti/tsugi-util/src/test/resources/descriptor_no_launch.xml b/lti/tsugi-util/src/test/resources/descriptor_no_launch.xml
similarity index 94%
rename from basiclti/tsugi-util/src/test/resources/descriptor_no_launch.xml
rename to lti/tsugi-util/src/test/resources/descriptor_no_launch.xml
index 38359dcb2558..82d97b5f441e 100644
--- a/basiclti/tsugi-util/src/test/resources/descriptor_no_launch.xml
+++ b/lti/tsugi-util/src/test/resources/descriptor_no_launch.xml
@@ -10,7 +10,7 @@
     </extensions>
     <icon>url to an icon for this tool (optional)</icon>
     <secure_icon>url to an icon for this tool (optional)</secure_icon>
-    <cartridge_icon identifierref="BLTI001_Icon"/>
+    <cartridge_icon identifierref="LTI001_Icon"/>
     <vendor>
         <code>vendor.com</code>
         <name>Vendor Name</name>
diff --git a/basiclti/tsugi-util/src/test/resources/descriptor_secure.xml b/lti/tsugi-util/src/test/resources/descriptor_secure.xml
similarity index 95%
rename from basiclti/tsugi-util/src/test/resources/descriptor_secure.xml
rename to lti/tsugi-util/src/test/resources/descriptor_secure.xml
index 8484af2de756..8c1f6e2eae2a 100644
--- a/basiclti/tsugi-util/src/test/resources/descriptor_secure.xml
+++ b/lti/tsugi-util/src/test/resources/descriptor_secure.xml
@@ -12,7 +12,7 @@
     <secure_launch_url>secure url to the basiclti launch URL</secure_launch_url>
     <icon>url to an icon for this tool (optional)</icon>
     <secure_icon>url to an icon for this tool (optional)</secure_icon>
-    <cartridge_icon identifierref="BLTI001_Icon"/>
+    <cartridge_icon identifierref="LTI001_Icon"/>
     <vendor>
         <code>vendor.com</code>
         <name>Vendor Name</name>
diff --git a/basiclti/tsugi-util/src/test/resources/nrps/sample_container.json b/lti/tsugi-util/src/test/resources/nrps/sample_container.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/nrps/sample_container.json
rename to lti/tsugi-util/src/test/resources/nrps/sample_container.json
diff --git a/basiclti/tsugi-util/src/test/resources/nrps/sample_member.json b/lti/tsugi-util/src/test/resources/nrps/sample_member.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/nrps/sample_member.json
rename to lti/tsugi-util/src/test/resources/nrps/sample_member.json
diff --git a/basiclti/tsugi-util/src/test/resources/nrps/sample_member_message.json b/lti/tsugi-util/src/test/resources/nrps/sample_member_message.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/nrps/sample_member_message.json
rename to lti/tsugi-util/src/test/resources/nrps/sample_member_message.json
diff --git a/basiclti/tsugi-util/src/test/resources/oauth2/sample_access_token.json b/lti/tsugi-util/src/test/resources/oauth2/sample_access_token.json
similarity index 100%
rename from basiclti/tsugi-util/src/test/resources/oauth2/sample_access_token.json
rename to lti/tsugi-util/src/test/resources/oauth2/sample_access_token.json
diff --git a/basiclti/web-ifp/pom.xml b/lti/web-ifp/pom.xml
similarity index 88%
rename from basiclti/web-ifp/pom.xml
rename to lti/web-ifp/pom.xml
index a5cebdfb0bee..1178836607d5 100644
--- a/basiclti/web-ifp/pom.xml
+++ b/lti/web-ifp/pom.xml
@@ -2,22 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>basiclti</artifactId>
-        <groupId>org.sakaiproject.basiclti</groupId>
+        <artifactId>lti</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
         <version>25-SNAPSHOT</version>
     </parent>
-  <name>sakai-web-portlet-basiclti</name>
-  <groupId>org.sakaiproject.basiclti</groupId>
-  <artifactId>sakai-web-portlet-basiclti</artifactId>
+  <name>sakai-web-portlet-lti</name>
+  <groupId>org.sakaiproject.lti</groupId>
+  <artifactId>sakai-web-portlet-lti</artifactId>
   <packaging>war</packaging>
   <dependencies>
   		<dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/basiclti/web-ifp/src/bundle/iframe.properties b/lti/web-ifp/src/bundle/iframe.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe.properties
rename to lti/web-ifp/src/bundle/iframe.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_ar.properties b/lti/web-ifp/src/bundle/iframe_ar.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_ar.properties
rename to lti/web-ifp/src/bundle/iframe_ar.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_bg.properties b/lti/web-ifp/src/bundle/iframe_bg.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_bg.properties
rename to lti/web-ifp/src/bundle/iframe_bg.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_ca.properties b/lti/web-ifp/src/bundle/iframe_ca.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_ca.properties
rename to lti/web-ifp/src/bundle/iframe_ca.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_de_DE.properties b/lti/web-ifp/src/bundle/iframe_de_DE.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_de_DE.properties
rename to lti/web-ifp/src/bundle/iframe_de_DE.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_es.properties b/lti/web-ifp/src/bundle/iframe_es.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_es.properties
rename to lti/web-ifp/src/bundle/iframe_es.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_eu.properties b/lti/web-ifp/src/bundle/iframe_eu.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_eu.properties
rename to lti/web-ifp/src/bundle/iframe_eu.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_fa_IR.properties b/lti/web-ifp/src/bundle/iframe_fa_IR.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_fa_IR.properties
rename to lti/web-ifp/src/bundle/iframe_fa_IR.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_fr_FR.properties b/lti/web-ifp/src/bundle/iframe_fr_FR.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_fr_FR.properties
rename to lti/web-ifp/src/bundle/iframe_fr_FR.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_hi_IN.properties b/lti/web-ifp/src/bundle/iframe_hi_IN.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_hi_IN.properties
rename to lti/web-ifp/src/bundle/iframe_hi_IN.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_ja.properties b/lti/web-ifp/src/bundle/iframe_ja.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_ja.properties
rename to lti/web-ifp/src/bundle/iframe_ja.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_mn.properties b/lti/web-ifp/src/bundle/iframe_mn.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_mn.properties
rename to lti/web-ifp/src/bundle/iframe_mn.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_pt_BR.properties b/lti/web-ifp/src/bundle/iframe_pt_BR.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_pt_BR.properties
rename to lti/web-ifp/src/bundle/iframe_pt_BR.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_ro_RO.properties b/lti/web-ifp/src/bundle/iframe_ro_RO.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_ro_RO.properties
rename to lti/web-ifp/src/bundle/iframe_ro_RO.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_sr.properties b/lti/web-ifp/src/bundle/iframe_sr.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_sr.properties
rename to lti/web-ifp/src/bundle/iframe_sr.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_sv.properties b/lti/web-ifp/src/bundle/iframe_sv.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_sv.properties
rename to lti/web-ifp/src/bundle/iframe_sv.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_tr_TR.properties b/lti/web-ifp/src/bundle/iframe_tr_TR.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_tr_TR.properties
rename to lti/web-ifp/src/bundle/iframe_tr_TR.properties
diff --git a/basiclti/web-ifp/src/bundle/iframe_zh_CN.properties b/lti/web-ifp/src/bundle/iframe_zh_CN.properties
similarity index 100%
rename from basiclti/web-ifp/src/bundle/iframe_zh_CN.properties
rename to lti/web-ifp/src/bundle/iframe_zh_CN.properties
diff --git a/basiclti/web-ifp/src/bundle/vm/edit.vm b/lti/web-ifp/src/bundle/vm/edit.vm
similarity index 100%
rename from basiclti/web-ifp/src/bundle/vm/edit.vm
rename to lti/web-ifp/src/bundle/vm/edit.vm
diff --git a/basiclti/web-ifp/src/bundle/vm/macros.vm b/lti/web-ifp/src/bundle/vm/macros.vm
similarity index 100%
rename from basiclti/web-ifp/src/bundle/vm/macros.vm
rename to lti/web-ifp/src/bundle/vm/macros.vm
diff --git a/basiclti/web-ifp/src/bundle/vm/main.vm b/lti/web-ifp/src/bundle/vm/main.vm
similarity index 100%
rename from basiclti/web-ifp/src/bundle/vm/main.vm
rename to lti/web-ifp/src/bundle/vm/main.vm
diff --git a/basiclti/web-ifp/src/bundle/vm/pick.vm b/lti/web-ifp/src/bundle/vm/pick.vm
similarity index 100%
rename from basiclti/web-ifp/src/bundle/vm/pick.vm
rename to lti/web-ifp/src/bundle/vm/pick.vm
diff --git a/basiclti/web-ifp/src/java/org/sakaiproject/portlet/util/JSPHelper.java b/lti/web-ifp/src/java/org/sakaiproject/portlet/util/JSPHelper.java
similarity index 100%
rename from basiclti/web-ifp/src/java/org/sakaiproject/portlet/util/JSPHelper.java
rename to lti/web-ifp/src/java/org/sakaiproject/portlet/util/JSPHelper.java
diff --git a/basiclti/web-ifp/src/java/org/sakaiproject/portlet/util/VelocityHelper.java b/lti/web-ifp/src/java/org/sakaiproject/portlet/util/VelocityHelper.java
similarity index 100%
rename from basiclti/web-ifp/src/java/org/sakaiproject/portlet/util/VelocityHelper.java
rename to lti/web-ifp/src/java/org/sakaiproject/portlet/util/VelocityHelper.java
diff --git a/basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java b/lti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
similarity index 99%
rename from basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
rename to lti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
index 607d8d13fd19..4a88a055b9a5 100644
--- a/basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
+++ b/lti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
@@ -51,7 +51,7 @@
 import org.sakaiproject.component.cover.ServerConfigurationService;
 // lti service
 import org.sakaiproject.lti.api.LTIService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.portlet.util.JSPHelper;
 import org.sakaiproject.portlet.util.VelocityHelper;
 import org.sakaiproject.site.api.ToolConfiguration;
@@ -201,8 +201,8 @@ public void doView(RenderRequest request, RenderResponse response)
 					m_ltiService.filterContent(content, tool);
 				}
 
-				height = SakaiBLTIUtil.getFrameHeight(tool, content, height);
-				newpage = SakaiBLTIUtil.getNewpage(tool, content, newpage);
+				height = SakaiLTIUtil.getFrameHeight(tool, content, height);
+				newpage = SakaiLTIUtil.getNewpage(tool, content, newpage);
 
 				String launch = (String) content.get("launch");
 				// Force http:// to pop-up if we are https://
diff --git a/basiclti/web-ifp/src/webapp/WEB-INF/portlet.xml b/lti/web-ifp/src/webapp/WEB-INF/portlet.xml
similarity index 100%
rename from basiclti/web-ifp/src/webapp/WEB-INF/portlet.xml
rename to lti/web-ifp/src/webapp/WEB-INF/portlet.xml
diff --git a/basiclti/web-ifp/src/webapp/WEB-INF/sakai/SakaiIFrame.xml b/lti/web-ifp/src/webapp/WEB-INF/sakai/SakaiIFrame.xml
similarity index 100%
rename from basiclti/web-ifp/src/webapp/WEB-INF/sakai/SakaiIFrame.xml
rename to lti/web-ifp/src/webapp/WEB-INF/sakai/SakaiIFrame.xml
diff --git a/basiclti/web-ifp/src/webapp/WEB-INF/velocity.config b/lti/web-ifp/src/webapp/WEB-INF/velocity.config
similarity index 100%
rename from basiclti/web-ifp/src/webapp/WEB-INF/velocity.config
rename to lti/web-ifp/src/webapp/WEB-INF/velocity.config
diff --git a/basiclti/web-ifp/src/webapp/WEB-INF/web.xml b/lti/web-ifp/src/webapp/WEB-INF/web.xml
similarity index 100%
rename from basiclti/web-ifp/src/webapp/WEB-INF/web.xml
rename to lti/web-ifp/src/webapp/WEB-INF/web.xml
diff --git a/basiclti/web-ifp/src/webapp/help.jsp b/lti/web-ifp/src/webapp/help.jsp
similarity index 100%
rename from basiclti/web-ifp/src/webapp/help.jsp
rename to lti/web-ifp/src/webapp/help.jsp
diff --git a/master/pom.xml b/master/pom.xml
index 62b7f1d41394..03f1f3b53d17 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -1813,20 +1813,20 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.sakaiproject.basiclti</groupId>
-        <artifactId>basiclti-api</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
+        <artifactId>lti-api</artifactId>
         <version>${sakai.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.sakaiproject.basiclti</groupId>
-        <artifactId>basiclti-util</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
+        <artifactId>lti-util</artifactId>
         <version>${sakai.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.sakaiproject.basiclti</groupId>
-        <artifactId>basiclti-common</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
+        <artifactId>lti-common</artifactId>
         <version>${sakai.version}</version>
         <!-- Depends on ResourceLoader so must be in each webapp -->
       </dependency>
diff --git a/plus/README.md b/plus/README.md
index 6eca86fe1fbf..f8839a2dbe22 100644
--- a/plus/README.md
+++ b/plus/README.md
@@ -149,7 +149,7 @@ permissions used when creating a new site when SakaiPlus receives an incoming si
 This field allows for overriding the default mapping from incoming LTI roles to Sakai roles.  See
 this documentation for detail on how role mapping works and the format for role mapping entries.
 
-* [Sakai to LTI Role Mapping](../basiclti/docs/LTIROLES.md)
+* [Sakai to LTI Role Mapping](../lti/docs/LTIROLES.md)
 
 *Registration Lock*
 
diff --git a/plus/api/pom.xml b/plus/api/pom.xml
index fa3bc42834cf..e759d707bcba 100644
--- a/plus/api/pom.xml
+++ b/plus/api/pom.xml
@@ -34,12 +34,12 @@
       <artifactId>sakai-kernel-api</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.sakaiproject.basiclti</groupId>
-        <artifactId>basiclti-api</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
+        <artifactId>lti-api</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.sakaiproject.basiclti</groupId>
-        <artifactId>basiclti-util</artifactId>
+        <groupId>org.sakaiproject.lti</groupId>
+        <artifactId>lti-util</artifactId>
     </dependency>
     <dependency>
         <groupId>org.sakaiproject.grading</groupId>
diff --git a/plus/impl/pom.xml b/plus/impl/pom.xml
index 1d1df6b003c6..51df0200d0e9 100644
--- a/plus/impl/pom.xml
+++ b/plus/impl/pom.xml
@@ -74,16 +74,16 @@
       <artifactId>mockito-core</artifactId>
     </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
             <version>${sakai.version}</version>
         </dependency>
     <dependency>
diff --git a/plus/impl/src/main/java/org/sakaiproject/plus/impl/PlusServiceImpl.java b/plus/impl/src/main/java/org/sakaiproject/plus/impl/PlusServiceImpl.java
index 7125296352b5..c171f72af896 100644
--- a/plus/impl/src/main/java/org/sakaiproject/plus/impl/PlusServiceImpl.java
+++ b/plus/impl/src/main/java/org/sakaiproject/plus/impl/PlusServiceImpl.java
@@ -95,15 +95,15 @@
 import org.tsugi.http.HttpUtil;
 import org.tsugi.http.HttpClientUtil;
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 
 import org.sakaiproject.lti.api.UserFinderOrCreator;
 import org.sakaiproject.lti.api.SiteEmailPreferenceSetter;
 import org.sakaiproject.lti.api.SiteMembershipUpdater;
 
-import org.sakaiproject.basiclti.util.SakaiKeySetUtil;
+import org.sakaiproject.lti.util.SakaiKeySetUtil;
 import org.tsugi.jackson.JacksonUtil;
 import org.sakaiproject.lti13.util.SakaiLaunchJWT;
 
@@ -212,12 +212,12 @@ public boolean enabled(Site site)
 	 */
 	@Override
 	public String getPlusServletPath() {
-		return SakaiBLTIUtil.getOurServerUrl() + "/plus/sakai";
+		return SakaiLTIUtil.getOurServerUrl() + "/plus/sakai";
 	}
 
 	@Override
 	public String getOidcKeySet() {
-		return SakaiBLTIUtil.getOurServerUrl() + "/imsblis/lti13/keyset";
+		return SakaiLTIUtil.getOurServerUrl() + "/imsblis/lti13/keyset";
 	}
 
 	@Override
@@ -444,42 +444,42 @@ public Map<String,String> getPayloadFromLaunchJWT(Tenant tenant, LaunchJWT launc
 		payload.put("deployment_id", launchJWT.deployment_id);
 		payload.put("oidc_token", tenant.getOidcToken());
 		payload.put("oidc_audience", tenant.getOidcAudience());
-		payload.put(BasicLTIConstants.LTI_MESSAGE_TYPE, launchJWT.message_type);
+		payload.put(LTIConstants.LTI_MESSAGE_TYPE, launchJWT.message_type);
 
 		if ( launchJWT.context != null ) {
-			if ( launchJWT.context.title != null ) payload.put(BasicLTIConstants.CONTEXT_TITLE, launchJWT.context.title);
-			if ( launchJWT.context.label != null ) payload.put(BasicLTIConstants.CONTEXT_LABEL, launchJWT.context.label);
+			if ( launchJWT.context.title != null ) payload.put(LTIConstants.CONTEXT_TITLE, launchJWT.context.title);
+			if ( launchJWT.context.label != null ) payload.put(LTIConstants.CONTEXT_LABEL, launchJWT.context.label);
 		}
 
 		// https://www.imsglobal.org/spec/lti/v1p3/#resource-link-claim
 		String linkId = launchJWT.resource_link != null ? launchJWT.resource_link.id : null;
 		if ( linkId != null ) {
-			payload.put(BasicLTIConstants.RESOURCE_LINK_ID, linkId);
-			if ( launchJWT.resource_link.title != null ) payload.put(BasicLTIConstants.RESOURCE_LINK_TITLE, launchJWT.resource_link.title);
-			if ( launchJWT.resource_link.description != null ) payload.put(BasicLTIConstants.RESOURCE_LINK_DESCRIPTION, launchJWT.resource_link.description);
+			payload.put(LTIConstants.RESOURCE_LINK_ID, linkId);
+			if ( launchJWT.resource_link.title != null ) payload.put(LTIConstants.RESOURCE_LINK_TITLE, launchJWT.resource_link.title);
+			if ( launchJWT.resource_link.description != null ) payload.put(LTIConstants.RESOURCE_LINK_DESCRIPTION, launchJWT.resource_link.description);
 		}
 
 		// User data
-		payload.put(BasicLTIConstants.USER_ID, launchJWT.subject);
-		payload.put(BasicLTIConstants.LAUNCH_PRESENTATION_LOCALE, launchJWT.locale);
-		payload.put(BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, launchJWT.email);
-		payload.put(BasicLTIConstants.LIS_PERSON_NAME_GIVEN, launchJWT.given_name);
-		payload.put(BasicLTIConstants.LIS_PERSON_NAME_FAMILY, launchJWT.family_name);
-		// payload.put(BasicLTIConstants.LIS_PERSON_NAME_MIDDLE, launchJWT.middle_name);
+		payload.put(LTIConstants.USER_ID, launchJWT.subject);
+		payload.put(LTIConstants.LAUNCH_PRESENTATION_LOCALE, launchJWT.locale);
+		payload.put(LTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY, launchJWT.email);
+		payload.put(LTIConstants.LIS_PERSON_NAME_GIVEN, launchJWT.given_name);
+		payload.put(LTIConstants.LIS_PERSON_NAME_FAMILY, launchJWT.family_name);
+		// payload.put(LTIConstants.LIS_PERSON_NAME_MIDDLE, launchJWT.middle_name);
 
 		String ltiRoles = launchJWT.getLTI11Roles();
-		if ( StringUtils.isNotBlank(ltiRoles) ) payload.put(BasicLTIConstants.ROLES, ltiRoles);
+		if ( StringUtils.isNotBlank(ltiRoles) ) payload.put(LTIConstants.ROLES, ltiRoles);
 
 		// TODO: Ask for this in custom...
-		// payload.put(BasicLTIConstants.USER_IMAGE, );
+		// payload.put(LTIConstants.USER_IMAGE, );
 		// payload.put("ext_email_delivery_preference", );
 
-		// Because basiclti-common can't (yet) be in shared
+		// Because lti-common can't (yet) be in shared
 		if ( launchJWT instanceof SakaiLaunchJWT ) {
 			SakaiLaunchJWT sakaiLaunchJWT = (SakaiLaunchJWT) launchJWT;
 			if ( sakaiLaunchJWT.sakai_extension != null ) {
 				if ( isNotEmpty(sakaiLaunchJWT.sakai_extension.sakai_eid) ) {
-					payload.put(BasicLTIConstants.EXT_SAKAI_PROVIDER_EID, sakaiLaunchJWT.sakai_extension.sakai_eid);
+					payload.put(LTIConstants.EXT_SAKAI_PROVIDER_EID, sakaiLaunchJWT.sakai_extension.sakai_eid);
 				}
 				payload.put("ext_sakai_server", sakaiLaunchJWT.sakai_extension.sakai_server);
 				payload.put("ext_sakai_serverid", sakaiLaunchJWT.sakai_extension.sakai_serverid);
@@ -1059,9 +1059,9 @@ public String createLineItem(Site site, Long assignmentId,
 		// Move into the destination time zone
 		String timeZone = tenant.getTimeZone();
 		if ( dueDate != null && StringUtils.isNotBlank(timeZone) ) {
-			dueDate = BasicLTIUtil.shiftJVMDateToTimeZone(dueDate, timeZone);
+			dueDate = LTIUtil.shiftJVMDateToTimeZone(dueDate, timeZone);
 		}
-		if ( dueDate != null ) li.endDateTime = BasicLTIUtil.getISO8601(dueDate);
+		if ( dueDate != null ) li.endDateTime = LTIUtil.getISO8601(dueDate);
 		String body = li.prettyPrintLog();
 
 		// Track this in our local database including success / failure of the LMS interaction
@@ -1271,9 +1271,9 @@ public String updateLineItem(Site site,
 		// Move into the destination time zone
 		String timeZone = tenant.getTimeZone();
 		if ( dueDate != null && StringUtils.isNotBlank(timeZone) ) {
-			dueDate = BasicLTIUtil.shiftJVMDateToTimeZone(dueDate, timeZone);
+			dueDate = LTIUtil.shiftJVMDateToTimeZone(dueDate, timeZone);
 		}
-		if ( dueDate != null ) li.endDateTime = BasicLTIUtil.getISO8601(dueDate);
+		if ( dueDate != null ) li.endDateTime = LTIUtil.getISO8601(dueDate);
 		String body = li.prettyPrintLog();
 
 		// In Update
@@ -1531,7 +1531,7 @@ public void processGradeEvent(Event event)
 		score.scoreMaximum = gradebookAssignment.getPoints();
 		score.comment = comment;
 		score.userId = subject.getSubject();
-		score.timestamp = BasicLTIUtil.getISO8601();
+		score.timestamp = LTIUtil.getISO8601();
 
 		// TODO: Think more about this - Canvas requires this but we don't know what various values mean in Canvas
 		// TODO: Review the Blackboard state diagram
diff --git a/plus/provider/pom.xml b/plus/provider/pom.xml
index 286ea1b0c4d8..c3db84c86540 100644
--- a/plus/provider/pom.xml
+++ b/plus/provider/pom.xml
@@ -15,20 +15,20 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.sakaiproject.basiclti</groupId>
-			<artifactId>basiclti-api</artifactId>
+			<groupId>org.sakaiproject.lti</groupId>
+			<artifactId>lti-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.sakaiproject.basiclti</groupId>
-			<artifactId>basiclti-util</artifactId>
+			<groupId>org.sakaiproject.lti</groupId>
+			<artifactId>lti-util</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.sakaiproject.basiclti</groupId>
-			<artifactId>basiclti-common</artifactId>
+			<groupId>org.sakaiproject.lti</groupId>
+			<artifactId>lti-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
diff --git a/plus/provider/src/main/java/org/sakaiproject/plus/ProviderServlet.java b/plus/provider/src/main/java/org/sakaiproject/plus/ProviderServlet.java
index 6e6bd5b0ca08..37681d44a6ae 100644
--- a/plus/provider/src/main/java/org/sakaiproject/plus/ProviderServlet.java
+++ b/plus/provider/src/main/java/org/sakaiproject/plus/ProviderServlet.java
@@ -55,8 +55,8 @@
 import org.json.simple.JSONObject;
 import org.json.simple.JSONArray;
 
-import org.tsugi.basiclti.BasicLTIConstants;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIConstants;
+import org.tsugi.lti.LTIUtil;
 import org.tsugi.lti13.LTI13JwtUtil;
 import org.tsugi.lti13.LTI13KeySetUtil;
 import org.tsugi.jackson.JacksonUtil;
@@ -75,8 +75,8 @@
 import org.sakaiproject.lti.api.UserPictureSetter;
 import org.sakaiproject.lti.api.SiteMembershipUpdater;
 import org.sakaiproject.lti.api.SiteMembershipsSynchroniser;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.sakaiproject.basiclti.util.SakaiKeySetUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
+import org.sakaiproject.lti.util.SakaiKeySetUtil;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.event.api.UsageSessionService;
 import org.sakaiproject.exception.IdUnusedException;
@@ -130,7 +130,7 @@ public class ProviderServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;
 	private static ResourceLoader rb = new ResourceLoader("plus");
-	private static final String BASICLTI_RESOURCE_LINK = "blti:resource_link_id";
+	private static final String LTI_RESOURCE_LINK = "blti:resource_link_id";
 
 	private static final String DEFAULT_PRIVACY_URL = "https://www.sakailms.com/plus-privacylaunch";
 
@@ -413,7 +413,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
 			// Check if we are loop-backing on the same server, and already logged in as same user
 			Session sess = sessionManager.getCurrentSession();
-			String serverUrl = SakaiBLTIUtil.getOurServerUrl();
+			String serverUrl = SakaiLTIUtil.getOurServerUrl();
 			String iss = launch.tenant.getIssuer();
 			if ( StringUtils.equals(iss, serverUrl) ) {
 				log.debug("Running loopback id={} serverUrl={} iss={}", sess.getId(), serverUrl,iss);
@@ -464,7 +464,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
 			// Construct a URL to the site
 			StringBuilder url = new StringBuilder();
-			url.append(SakaiBLTIUtil.getOurServerUrl());
+			url.append(SakaiLTIUtil.getOurServerUrl());
 			url.append(serverConfigurationService.getString("portalPath", "/portal"));
 			url.append("/site/");
 			url.append(site.getId());
@@ -507,7 +507,7 @@ protected void handleOIDCLogin(HttpServletRequest request, HttpServletResponse r
 			return;
 		}
 
-		String browserSig = BasicLTIUtil.getBrowserSignature(request);
+		String browserSig = LTIUtil.getBrowserSignature(request);
 		String stateSig = LTI13Util.sha256(randomUUID + browserSig);
 		Key privateKey = localKeyPair.getPrivate();
 		String seconds = (Instant.now().getEpochSecond()+"");
@@ -672,7 +672,7 @@ protected void handleDynamicRegistration(HttpServletRequest request, HttpServlet
 		String host = null;
 		String domain = null;
 		try {
-			serverUrl = SakaiBLTIUtil.getOurServerUrl();
+			serverUrl = SakaiLTIUtil.getOurServerUrl();
 			URL netUrl = new URL(serverUrl);
 			host = netUrl.getHost();
 			domain = serverConfigurationService.getString("plus.dynamic.domain", host);
@@ -835,7 +835,7 @@ protected void handleRepost(HttpServletRequest request, HttpServletResponse resp
 		r.append("<!DOCTYPE html>\n");
 		r.append("<!-- SakaiPlus handleRepost() frame/cookie check... -->\n");
 		r.append("<form id=\"popform\" method=\"post\" action=\"");
-		r.append(SakaiBLTIUtil.getOurServletPath(request));
+		r.append(SakaiLTIUtil.getOurServletPath(request));
 		r.append("\">\n");
 		r.append("<input type=\"hidden\" name=\"repost\" value=\"42\">\n");
 		for (Enumeration<String> e = request.getParameterNames(); e.hasMoreElements(); ) {
@@ -895,7 +895,7 @@ protected void handleRepost(HttpServletRequest request, HttpServletResponse resp
 		r.append("}\n");
 
 		r.append("</script>\n");
-		BasicLTIUtil.sendHTMLPage(response, r.toString());
+		LTIUtil.sendHTMLPage(response, r.toString());
 	}
 
 	protected Launch validate(Map payload, SakaiLaunchJWT launchJWT, Tenant tenant) throws LTIException
@@ -903,7 +903,7 @@ protected Launch validate(Map payload, SakaiLaunchJWT launchJWT, Tenant tenant)
 		  //check parameters
 		  String id_token = (String) payload.get("id_token");
 		  String tenant_guid = (String) payload.get("tenant_guid");
-		  String context_id = (String) payload.get(BasicLTIConstants.CONTEXT_ID);
+		  String context_id = (String) payload.get(LTIConstants.CONTEXT_ID);
 
 		// Begin Validation
 
@@ -997,8 +997,8 @@ protected Site findOrCreateSite(Map payload, Tenant tenant) throws LTIException
 			log.debug("siteId={}", siteId);
 		}
 
-		final String context_title_orig = (String) payload.get(BasicLTIConstants.CONTEXT_TITLE);
-		final String context_label = (String) payload.get(BasicLTIConstants.CONTEXT_LABEL);
+		final String context_title_orig = (String) payload.get(LTIConstants.CONTEXT_TITLE);
+		final String context_label = (String) payload.get(LTIConstants.CONTEXT_LABEL);
 
 		// Site title is editable; cannot but null/empty after HTML stripping, and cannot exceed max length
 		String context_title = formattedText.stripHtmlFromText(context_title_orig, true, true);
@@ -1111,11 +1111,11 @@ protected Site findOrCreateSite(Map payload, Tenant tenant) throws LTIException
 				sakai_type = serverConfigurationService.getString(PlusService.PLUS_NEW_SITE_TYPE, PlusService.PLUS_NEW_SITE_TYPE_DEFAULT);
 				if(StringUtils.isBlank(sakai_type)) {
 					// It wasn't specced in the props. Test for the ims course context type.
-					final String context_type = (String) payload.get(BasicLTIConstants.CONTEXT_TYPE);
-					if (BasicLTIUtil.equalsIgnoreCase(context_type, "course")) {
+					final String context_type = (String) payload.get(LTIConstants.CONTEXT_TYPE);
+					if (LTIUtil.equalsIgnoreCase(context_type, "course")) {
 						sakai_type = "course";
 					} else {
-						sakai_type = BasicLTIConstants.NEW_SITE_TYPE;
+						sakai_type = LTIConstants.NEW_SITE_TYPE;
 					}
 				}
 				site = siteService.addSite(siteId, sakai_type);
@@ -1180,13 +1180,13 @@ private final void updateSiteDetailsIfChanged(Site site, String context_title, S
 		boolean changed = false;
 
 		// Only copy title once
-		if (StringUtils.isNotBlank(context_title) && BasicLTIUtil.isBlank(site.getTitle()) ) {
+		if (StringUtils.isNotBlank(context_title) && LTIUtil.isBlank(site.getTitle()) ) {
 			site.setTitle(context_title);
 			changed = true;
 		}
 
 		// Only copy description once
-		if (StringUtils.isNotBlank(context_label) && BasicLTIUtil.isBlank(site.getShortDescription()) ) {
+		if (StringUtils.isNotBlank(context_label) && LTIUtil.isBlank(site.getShortDescription()) ) {
 			site.setShortDescription(context_label);
 			changed = true;
 		}
@@ -1237,7 +1237,7 @@ private void handleCanvasConfig(HttpServletRequest request, HttpServletResponse
 		String host = null;
 		String domain = null;
 		try {
-			serverUrl = SakaiBLTIUtil.getOurServerUrl();
+			serverUrl = SakaiLTIUtil.getOurServerUrl();
 			URL netUrl = new URL(serverUrl);
 			host = netUrl.getHost();
 			domain = serverConfigurationService.getString(PlusService.PLUS_CANVAS_DOMAIN, host);
diff --git a/plus/tool/pom.xml b/plus/tool/pom.xml
index b720cd5d7fd7..60370216b28c 100644
--- a/plus/tool/pom.xml
+++ b/plus/tool/pom.xml
@@ -70,12 +70,12 @@
 			<artifactId>thymeleaf-extras-java8time</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
             <version>${sakai.version}</version>
         </dependency>
 	</dependencies>
diff --git a/plus/tool/src/main/java/org/sakaiproject/plus/tool/MainController.java b/plus/tool/src/main/java/org/sakaiproject/plus/tool/MainController.java
index 03ac21a034c3..ba987e1f7338 100644
--- a/plus/tool/src/main/java/org/sakaiproject/plus/tool/MainController.java
+++ b/plus/tool/src/main/java/org/sakaiproject/plus/tool/MainController.java
@@ -42,7 +42,7 @@
 import org.springframework.context.MessageSource;
 
 import org.sakaiproject.lti.api.LTIService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -347,7 +347,7 @@ private void loadModel(Model model, HttpServletRequest request) {
 		model.addAttribute("siteId", placement.getContext());
 		String baseUrl = "/portal/site/" + placement.getContext() + "/tool/" + toolManager.getCurrentPlacement().getId();
 		model.addAttribute("baseUrl", baseUrl);
-		String serverUrl = SakaiBLTIUtil.getOurServerUrl();
+		String serverUrl = SakaiLTIUtil.getOurServerUrl();
 		model.addAttribute("serverUrl", serverUrl);
 		model.addAttribute("sakaiHtmlHead", (String) request.getAttribute("sakai.html.head"));
 	}
diff --git a/plus/tool/src/main/webapp/WEB-INF/templates/form.html b/plus/tool/src/main/webapp/WEB-INF/templates/form.html
index 3253bc0b62d8..7acdbe6966bc 100644
--- a/plus/tool/src/main/webapp/WEB-INF/templates/form.html
+++ b/plus/tool/src/main/webapp/WEB-INF/templates/form.html
@@ -109,7 +109,7 @@ <h1><span th="#{plus.tool.tenant.title}">Tenant:<span>
           </div>
         </div>
         <p>
-        (<a href="https://github.com/sakaiproject/sakai/blob/master/basiclti/docs/LTIROLES.md" target="_blank" th:text="#{plus.tool.inboundrolemap.url}">SakaiPlus Tenant Documentation</a>)
+        (<a href="https://github.com/sakaiproject/sakai/blob/master/lti/docs/LTIROLES.md" target="_blank" th:text="#{plus.tool.inboundrolemap.url}">SakaiPlus Tenant Documentation</a>)
         </p>
         <div id="verbose-group" class="form-group form-switch">
           <div>
diff --git a/pom.xml b/pom.xml
index 969778c5e2f2..ac46c468f271 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
                 <module>announcement</module>
                 <module>archive</module>
                 <module>assignment</module>
-                <module>basiclti</module>
+                <module>lti</module>
                 <module>calendar</module>
                 <module>card-game</module>
                 <module>chat</module>
@@ -140,7 +140,7 @@
                 <module>archive</module>
                 <module>assignment</module>
                 <module>assignment2</module>
-                <module>basiclti</module>
+                <module>lti</module>
                 <module>calendar</module>
                 <module>chat</module>
                 <module>citations</module>
diff --git a/portal/portal-impl/impl/pom.xml b/portal/portal-impl/impl/pom.xml
index 6aa59600235e..7d27d6bd31d1 100644
--- a/portal/portal-impl/impl/pom.xml
+++ b/portal/portal-impl/impl/pom.xml
@@ -80,8 +80,8 @@
             <artifactId>pasystem-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/portal/portal-service-impl/impl/pom.xml b/portal/portal-service-impl/impl/pom.xml
index 0c68bfdae12e..8e23502f3e37 100644
--- a/portal/portal-service-impl/impl/pom.xml
+++ b/portal/portal-service-impl/impl/pom.xml
@@ -44,8 +44,8 @@
             <artifactId>sakai-portal-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.portlet</groupId>
diff --git a/site-manage/site-manage-impl/impl/pom.xml b/site-manage/site-manage-impl/impl/pom.xml
index 64cf778e9272..473e9ba7b49f 100644
--- a/site-manage/site-manage-impl/impl/pom.xml
+++ b/site-manage/site-manage-impl/impl/pom.xml
@@ -123,8 +123,8 @@
         	<artifactId>entitybroker-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.scheduler</groupId>
diff --git a/site-manage/site-manage-tool/tool/pom.xml b/site-manage/site-manage-tool/tool/pom.xml
index 0b13182b37eb..a92a6739dda9 100644
--- a/site-manage/site-manage-tool/tool/pom.xml
+++ b/site-manage/site-manage-tool/tool/pom.xml
@@ -15,12 +15,12 @@
     <packaging>war</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
index 75792e147b37..680d38c78497 100644
--- a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
+++ b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
@@ -138,7 +138,7 @@
 import org.sakaiproject.importer.api.SakaiArchive;
 import org.sakaiproject.javax.PagingPosition;
 import org.sakaiproject.lti.api.LTIService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.memory.api.Cache;
 import org.sakaiproject.memory.api.MemoryService;
 import org.sakaiproject.rubrics.api.RubricsService;
@@ -4211,8 +4211,8 @@ private void buildLTIToolContextForTemplate(Context context,
 								Map<String, Object> m = new HashMap<>();
 								Map<String, Object> ltiToolValues = ltiService.getTool(Long.valueOf(ltiToolId), ltiSiteId);
 								if (ltiToolValues != null) {
-									m.put(LTIService.LTI_TITLE, SakaiBLTIUtil.getToolTitle(ltiToolValues, content, null));
-									m.put("toolTitle", SakaiBLTIUtil.getToolTitle(ltiToolValues, content, null));
+									m.put(LTIService.LTI_TITLE, SakaiLTIUtil.getToolTitle(ltiToolValues, content, null));
+									m.put("toolTitle", SakaiLTIUtil.getToolTitle(ltiToolValues, content, null));
 									m.put("contentKey", content.get(LTIService.LTI_ID));
 									linkedLtiContents.put(ltiToolId, m);
 								}
diff --git a/sitestats/sitestats-bundle/src/resources/Events.properties b/sitestats/sitestats-bundle/src/resources/Events.properties
index 6df1de9a4274..7de50f5f8bdf 100644
--- a/sitestats/sitestats-bundle/src/resources/Events.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events.properties
@@ -23,8 +23,8 @@ asn.save.submission=Assignment save
 asn.grade.submission=Assignment grade/release/return
 
 # LTI
-basiclti.config=BasicLTI tool configured
-basiclti.launch=BasicLTI tool launched
+basiclti.config=LTI tool configured
+basiclti.launch=LTI tool launched
 
 # blogwow!
 blog.blog.created = Blog created
diff --git a/sitestats/sitestats-bundle/src/resources/Events_bg.properties b/sitestats/sitestats-bundle/src/resources/Events_bg.properties
index 4eaba3e02107..1279f51cb4c5 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_bg.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_bg.properties
@@ -23,8 +23,8 @@ asn.save.submission=\u0417\u0430\u043f\u0430\u0437\u0432\u0430\u043d\u0435 \u043
 asn.grade.submission=\u041e\u0446\u0435\u043d\u043a\u0430 \u043d\u0430 \u0437\u0430\u0434\u0430\u0447\u0430\u0442\u0430/\u043f\u043e\u0434\u0430\u0432\u0430\u043d\u0435/\u0432\u0440\u044a\u0449\u0430\u043d\u0435
 
 # LTI
-basiclti.config=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 BasicLTI
-basiclti.launch=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 BasicLTI
+basiclti.config=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 LTI
+basiclti.launch=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 LTI
 
 # blogwow!
 blog.blog.created=\u0421\u044a\u0437\u0434\u0430\u0434\u0435\u043d \u0431\u043b\u043e\u0433
diff --git a/sitestats/sitestats-bundle/src/resources/Events_ca.properties b/sitestats/sitestats-bundle/src/resources/Events_ca.properties
index e24b38748fc2..5d3972b7750c 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_ca.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_ca.properties
@@ -25,8 +25,8 @@ asn.resubmit.assignment=Habilita que es pugui tornar a lliurar una activitat
 asn.resubmit.submission=Habilitat que es pugui tornar a lliurar una activitat a l\u2019estudiant
 
 # LTI
-basiclti.config=Eina BasicLTI configurada
-basiclti.launch=Eina BasicLTI iniciada
+basiclti.config=Eina LTI configurada
+basiclti.launch=Eina LTI iniciada
 
 # blogwow!
 blog.blog.created=Creaci\u00f3 d\u2019un Blog 
diff --git a/sitestats/sitestats-bundle/src/resources/Events_de_DE.properties b/sitestats/sitestats-bundle/src/resources/Events_de_DE.properties
index 046fc90b7182..dbe99a8c8b75 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_de_DE.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_de_DE.properties
@@ -14,8 +14,8 @@ asn.delete.assignment=Aufgabe l\u00f6schen
 asn.submit.submission=Einreichung der Aufgabe
 asn.save.submission=Aufgabe speichern
 asn.grade.submission=Aufgabe bewerten/freigeben/zur\u00fcckgeben
-basiclti.config=BasicLTI-Tool konfiguriert
-basiclti.launch=BasicLTI-Tool gestartet
+basiclti.config=LTI-Tool konfiguriert
+basiclti.launch=LTI-Tool gestartet
 blog.blog.created=Blog erstellt
 blog.entry.saved=Blog-Eintrag hinzugef\u00fcgt/bearbeitet
 blog.entry.removed=Blog-Eintrag entfernt
diff --git a/sitestats/sitestats-bundle/src/resources/Events_es.properties b/sitestats/sitestats-bundle/src/resources/Events_es.properties
index 8cc6a49f0245..c3c10aa2531d 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_es.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_es.properties
@@ -23,8 +23,8 @@ asn.save.submission=Guardar tarea
 asn.grade.submission=Calificar/publicar/devolver tarea
 
 # LTI
-basiclti.config=Herramienta de BasicLTI configurada
-basiclti.launch=Herramienta de BasicLTI lanzada
+basiclti.config=Herramienta de LTI configurada
+basiclti.launch=Herramienta de LTI lanzada
 
 # blogwow!
 blog.blog.created=Blog creado
diff --git a/sitestats/sitestats-bundle/src/resources/Events_eu.properties b/sitestats/sitestats-bundle/src/resources/Events_eu.properties
index 5405884cf03f..0aae58136178 100755
--- a/sitestats/sitestats-bundle/src/resources/Events_eu.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_eu.properties
@@ -25,8 +25,8 @@ asn.resubmit.assignment=Gaitu berbidalketa
 asn.resubmit.submission=Gaitu berbidalketa ikasleari
 
 # LTI
-basiclti.config=BasicLTI tresna konfiguratu duzu
-basiclti.launch=BasicLTI tresna abiarazi duzu
+basiclti.config=LTI tresna konfiguratu duzu
+basiclti.launch=LTI tresna abiarazi duzu
 
 # blogwow!
 blog.blog.created=Bloga sortu da
diff --git a/sitestats/sitestats-bundle/src/resources/Events_fa_IR.properties b/sitestats/sitestats-bundle/src/resources/Events_fa_IR.properties
index 6c7a384ed5c2..c3baf7508305 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_fa_IR.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_fa_IR.properties
@@ -22,8 +22,8 @@ asn.save.submission=\u0630\u062e\u06cc\u0631\u0647 \u062a\u06a9\u0644\u06cc\u064
 asn.grade.submission=\u0646\u0645\u0631\u0647 / \u0627\u0646\u062a\u0634\u0627\u0631 / \u0628\u0627\u0632\u06af\u0634\u062a \u062a\u06a9\u0644\u06cc\u0641
 
 # LTI
-basiclti.config=\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0627\u0628\u0632\u0627\u0631 BasicLTI \u0627\u0646\u062c\u0627\u0645 \u0634\u062f
-basiclti.launch=\u0627\u0628\u0632\u0627\u0631 BasicLTI \u0627\u062c\u0631\u0627 \u0634\u062f
+basiclti.config=\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0627\u0628\u0632\u0627\u0631 LTI \u0627\u0646\u062c\u0627\u0645 \u0634\u062f
+basiclti.launch=\u0627\u0628\u0632\u0627\u0631 LTI \u0627\u062c\u0631\u0627 \u0634\u062f
 
 # blogwow!
 blog.blog.created=\u0648\u0628\u0644\u0627\u06af \u0627\u06cc\u062c\u0627\u062f \u0634\u062f
diff --git a/sitestats/sitestats-bundle/src/resources/Events_fr_FR.properties b/sitestats/sitestats-bundle/src/resources/Events_fr_FR.properties
index dfbe9db9d50a..113e20fa0093 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_fr_FR.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_fr_FR.properties
@@ -23,8 +23,8 @@ asn.save.submission=Sauvegarder devoir
 asn.grade.submission=Noter/Envoyer/Rendre devoir
 
 # LTI
-basiclti.config=Configuration outil BasicLTI
-basiclti.launch=Lancement outil BasicLTI
+basiclti.config=Configuration outil LTI
+basiclti.launch=Lancement outil LTI
 
 # blogwow!
 blog.blog.created=Blog cr\u00e9\u00e9.
diff --git a/sitestats/sitestats-bundle/src/resources/Events_hi_IN.properties b/sitestats/sitestats-bundle/src/resources/Events_hi_IN.properties
index e6a96ecfcec4..26f69e6a9f5d 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_hi_IN.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_hi_IN.properties
@@ -22,8 +22,8 @@ asn.save.submission=\u0905\u0938\u093e\u0907\u0928\u092e\u0947\u0902\u091f \u093
 asn.grade.submission=\u0905\u0938\u093e\u0907\u0928\u092e\u0947\u0902\u091f \u0917\u094d\u0930\u0947\u0921/\u0930\u093f\u0939\u093e\u0908/\u0935\u093e\u092a\u0938\u0940
 
 # LTI
-basiclti.config=BasicLTI \u0909\u092a\u0915\u0930\u0923 \u0915\u0949\u0928\u094d\u092b\u093c\u093f\u0917\u0930 \u0915\u093f\u092f\u093e \u0917\u092f\u093e
-basiclti.launch=BasicLTI \u0909\u092a\u0915\u0930\u0923 \u0915\u093e \u0936\u0941\u092d\u093e\u0930\u0902\u092d \u0915\u093f\u092f\u093e \u0917\u092f\u093e 
+basiclti.config=LTI \u0909\u092a\u0915\u0930\u0923 \u0915\u0949\u0928\u094d\u092b\u093c\u093f\u0917\u0930 \u0915\u093f\u092f\u093e \u0917\u092f\u093e
+basiclti.launch=LTI \u0909\u092a\u0915\u0930\u0923 \u0915\u093e \u0936\u0941\u092d\u093e\u0930\u0902\u092d \u0915\u093f\u092f\u093e \u0917\u092f\u093e 
 
 # blogwow!
 blog.blog.created=\u092c\u094d\u0932\u0949\u0917 \u092c\u0928\u093e\u092f\u093e \u0917\u092f\u093e 
diff --git a/sitestats/sitestats-bundle/src/resources/Events_mn.properties b/sitestats/sitestats-bundle/src/resources/Events_mn.properties
index 6ca2c0c04037..24872ae59826 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_mn.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_mn.properties
@@ -26,8 +26,8 @@ asn.save.submission=\u0414\u0430\u0430\u043B\u0433\u0430\u0432\u0430\u0440 \u044
 asn.grade.submission=\u0414\u0430\u0430\u043B\u0433\u0430\u0432\u0440\u044B\u0433 \u0434\u04AF\u0433\u043D\u044D\u0445/\u0433\u0430\u0440\u0433\u0430\u0445/\u0431\u0443\u0446\u0430\u0430\u0445
 
 # LTI
-basiclti.config=BasicLTI \u0445\u044D\u0440\u044D\u0433\u0441\u043B\u0438\u0439\u043D \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E \u0445\u0438\u0439\u0433\u0434\u0441\u044D\u043D
-basiclti.launch=BasicLTI \u0445\u044D\u0440\u044D\u0433\u0441\u043B\u0438\u0439\u0433 \u0430\u0436\u043B\u0443\u0443\u043B\u0441\u0430\u043D
+basiclti.config=LTI \u0445\u044D\u0440\u044D\u0433\u0441\u043B\u0438\u0439\u043D \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E \u0445\u0438\u0439\u0433\u0434\u0441\u044D\u043D
+basiclti.launch=LTI \u0445\u044D\u0440\u044D\u0433\u0441\u043B\u0438\u0439\u0433 \u0430\u0436\u043B\u0443\u0443\u043B\u0441\u0430\u043D
 
 # blogwow!
 blog.blog.created = \u0411\u043B\u043E\u0433 \u04AF\u04AF\u0441\u0433\u044D\u0433\u0434\u043B\u044D\u044D
diff --git a/sitestats/sitestats-bundle/src/resources/Events_pt_BR.properties b/sitestats/sitestats-bundle/src/resources/Events_pt_BR.properties
index 25f316d2c812..7b8e23f68e82 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_pt_BR.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_pt_BR.properties
@@ -27,8 +27,8 @@ asn.save.submission=Salvar Atividade
 asn.grade.submission=Avaliar/publicar/devolver Atividade
 
 # LTI
-basiclti.config=Ferramenta BasicLTI configurada
-basiclti.launch=Ferramenta BasicLTI iniciada
+basiclti.config=Ferramenta LTI configurada
+basiclti.launch=Ferramenta LTI iniciada
 
 # blogwow!
 blog.blog.created = Blog criado
diff --git a/sitestats/sitestats-bundle/src/resources/Events_ro_RO.properties b/sitestats/sitestats-bundle/src/resources/Events_ro_RO.properties
index a9c629f9925f..41b00a86e7e3 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_ro_RO.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_ro_RO.properties
@@ -23,8 +23,8 @@ asn.save.submission=Salveaza tema
 asn.grade.submission=Notare/publicare/returnare tema
 
 # LTI
-basiclti.config=Instrumentul BasicLTI configurat
-basiclti.launch=Instrumentul BasicLTI lansat
+basiclti.config=Instrumentul LTI configurat
+basiclti.launch=Instrumentul LTI lansat
 
 # blogwow!
 blog.blog.created=Blog creat
diff --git a/sitestats/sitestats-bundle/src/resources/Events_sv.properties b/sitestats/sitestats-bundle/src/resources/Events_sv.properties
index fed93bc45c75..d3a8b3265283 100755
--- a/sitestats/sitestats-bundle/src/resources/Events_sv.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_sv.properties
@@ -256,8 +256,8 @@ sitestats.prefs.edit=Sajtstatistik inst\u00e4llningar redigerad
 #sms.task.delete= SMS ta bort
 
 # basiclti
-basiclti.config=Verktyget BasicLTI konfigurerad
-basiclti.launch=Verktyget BasicLTI startad
+basiclti.config=Verktyget LTI konfigurerad
+basiclti.launch=Verktyget LTI startad
 
 # qna
 qna.answer.created=Fr\u00e5gor och Svar Skapa Svar
diff --git a/sitestats/sitestats-bundle/src/resources/Events_tr_TR.properties b/sitestats/sitestats-bundle/src/resources/Events_tr_TR.properties
index 4a6a1bf67254..f7ecf2c96cc8 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_tr_TR.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_tr_TR.properties
@@ -14,8 +14,8 @@ asn.delete.assignment=\u00d6dev Silebilme
 asn.submit.submission=\u00d6dev Teslim Edebilme
 asn.save.submission=\u00d6dev kay\u0131t
 asn.grade.submission=\u00d6dev de\u011ferlendirme/yay\u0131nlama/g\u00f6nderme
-basiclti.config=BasicLTI arac\u0131 ayarland\u0131
-basiclti.launch=BasicLTI arac\u0131 \u00e7al\u0131\u015ft\u0131r\u0131ld\u0131
+basiclti.config=LTI arac\u0131 ayarland\u0131
+basiclti.launch=LTI arac\u0131 \u00e7al\u0131\u015ft\u0131r\u0131ld\u0131
 blog.blog.created=Web g\u00fcnl\u00fc\u011f\u00fc olu\u015fturuldu
 blog.entry.saved=Web g\u00fcnl\u00fc\u011f\u00fc girdisi eklendi/d\u00fczenlendi
 blog.entry.removed=Web g\u00fcnl\u00fc\u011f\u00fc girdisi kald\u0131r\u0131ld\u0131
diff --git a/sitestats/sitestats-bundle/src/resources/Events_zh_CN.properties b/sitestats/sitestats-bundle/src/resources/Events_zh_CN.properties
index 5e5be84b1d36..e6f18ac4e1cc 100644
--- a/sitestats/sitestats-bundle/src/resources/Events_zh_CN.properties
+++ b/sitestats/sitestats-bundle/src/resources/Events_zh_CN.properties
@@ -21,8 +21,8 @@ asn.save.submission=\u4FDD\u5B58\u4F5C\u4E1A
 asn.grade.submission=\u4F5C\u4E1A\u8BC4\u5206/\u53D1\u5E03/\u8FD4\u8FD8
 
 # LTI
-basiclti.config=\u8BBE\u7F6EBasicLTI\u5DE5\u5177
-basiclti.launch=\u89E6\u53D1BasicLTI\u5DE5\u5177
+basiclti.config=\u8BBE\u7F6ELTI\u5DE5\u5177
+basiclti.launch=\u89E6\u53D1LTI\u5DE5\u5177
 
 # blogwow!
 blog.blog.created=\u521B\u5EFABlog