diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java
index 5ba4ab8a..a1ca1d1f 100644
--- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java
+++ b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java
@@ -52,16 +52,18 @@
  *
  * Users need to provide "id", "index", "job_name", and "interval" parameter to schedule
  * a job. e.g.
- * {@code POST /_opendistro/scheduler_sample/watch?id=kibana-job-id&job_name=watch kibana index&index=.kibana_1&interval=1"}
+ * {@code 
+ * POST /_plugins/scheduler_sample/watch?id=dashboards-job-id&job_name=watch dashboards index&index=.opensearch_dashboards_1&interval=1
+ * }
  *
- * creates a job with id "1" and job name "watch kibana index", which logs ".kibana_1" index's shards info
- * every 1 minute
+ * creates a job with id "dashboards-job-id" and job name "watch dashboards index", 
+ * which logs ".opensearch_dashboards_1" index's shards info every 1 minute
  *
  * Users can remove that job by calling
- * {@code DELETE /_opendistro/scheduler_sample/watch?id=kibana-job-id}
+ * {@code DELETE /_plugins/scheduler_sample/watch?id=dashboards-job-id}
  */
 public class SampleExtensionRestHandler extends BaseRestHandler {
-    public static final String WATCH_INDEX_URI = "/_opendistro/scheduler_sample/watch";
+    public static final String WATCH_INDEX_URI = "/_plugins/scheduler_sample/watch";
 
     @Override
     public String getName() {
diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java
index 9826da2f..fc3dfad5 100644
--- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java
+++ b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java
@@ -43,10 +43,10 @@
 /**
  * A sample job runner class.
  *
- * The job runner should be a singleton class if it uses Elasticsearch client or other objects passed
- * from Elasticsearch. Because when registering the job runner to JobScheduler plugin, Elasticsearch has
+ * The job runner should be a singleton class if it uses OpenSearch client or other objects passed
+ * from OpenSearch. Because when registering the job runner to JobScheduler plugin, OpenSearch has
  * not invoke plugins' createComponents() method. That is saying the plugin is not completely initalized,
- * and the Elasticsearch {@link org.opensearch.client.Client}, {@link ClusterService} and other objects
+ * and the OpenSearch {@link org.opensearch.client.Client}, {@link ClusterService} and other objects
  * are not available to plugin and this job runner.
  *
  * So we have to move this job runner intialization to {@link Plugin} createComponents() method, and using
diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
index 2866d6da..eb1638b4 100644
--- a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
+++ b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
@@ -82,7 +82,7 @@ public LockService(final Client client, final ClusterService clusterService) {
 
     private String lockMapping() {
         try {
-            InputStream in = LockService.class.getResourceAsStream("opendistro_job_scheduler_lock.json");
+            InputStream in = LockService.class.getResourceAsStream("opensearch_job_scheduler_lock.json");
             StringBuilder stringBuilder = new StringBuilder();
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
             for (String line; (line = bufferedReader.readLine()) != null; ) {
diff --git a/spi/src/main/resources/org/opensearch/jobscheduler/spi/utils/opendistro_job_scheduler_lock.json b/spi/src/main/resources/org/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json
similarity index 100%
rename from spi/src/main/resources/org/opensearch/jobscheduler/spi/utils/opendistro_job_scheduler_lock.json
rename to spi/src/main/resources/org/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json