diff --git a/README.md b/README.md
index 0320dfe..9f51cb1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
  
  * jberet-schedule-executor sub-module
     * scheduler based on `java.util.concurrent.ScheduledExecutorService`, suitable for Java SE applications.
-    * scheduler based on `javax.enterprise.concurrent.ManagedScheduledExecutorService`, suitable for Java EE applications.
+    * scheduler based on `jakarta.enterprise.concurrent.ManagedScheduledExecutorService`, suitable for Java EE applications.
  * jberet-schedule-timer sub-module
     * scheduler based on EJB Timer
   
diff --git a/jberet-schedule-executor/src/main/java/org/jberet/schedule/JobScheduleConfig.java b/jberet-schedule-executor/src/main/java/org/jberet/schedule/JobScheduleConfig.java
index 05b24f9..5b24f13 100644
--- a/jberet-schedule-executor/src/main/java/org/jberet/schedule/JobScheduleConfig.java
+++ b/jberet-schedule-executor/src/main/java/org/jberet/schedule/JobScheduleConfig.java
@@ -10,15 +10,15 @@
 
 package org.jberet.schedule;
 
-import org.jberet.schedule._private.ScheduleExpressionAdapter;
+import java.io.Serializable;
+import java.util.Properties;
 
 import jakarta.ejb.ScheduleExpression;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.io.Serializable;
-import java.util.Properties;
+import org.jberet.schedule._private.ScheduleExpressionAdapter;
 
 /**
  * Represents job schedule configuration, typically passed from the client side
@@ -54,7 +54,7 @@ public final class JobScheduleConfig implements Serializable {
     /**
      * The schedule expression for calendar-based job schedule.
      *
-     * @see "javax.ejb.ScheduleExpression"
+     * @see "jakarta.ejb.ScheduleExpression"
      */
     @XmlJavaTypeAdapter(ScheduleExpressionAdapter.class)
     final ScheduleExpression scheduleExpression;
@@ -163,7 +163,7 @@ public Properties getJobParameters() {
     }
 
     /**
-     * Gets {@code javax.ejb.ScheduleExpression} for calendar-based job schedule.
+     * Gets {@code jakarta.ejb.ScheduleExpression} for calendar-based job schedule.
      *
      * @return schedule expression, may be null
      */
diff --git a/jberet-schedule-executor/src/main/java/org/jberet/schedule/SchedulingJobListener.java b/jberet-schedule-executor/src/main/java/org/jberet/schedule/SchedulingJobListener.java
index 812f708..57cce88 100644
--- a/jberet-schedule-executor/src/main/java/org/jberet/schedule/SchedulingJobListener.java
+++ b/jberet-schedule-executor/src/main/java/org/jberet/schedule/SchedulingJobListener.java
@@ -10,9 +10,16 @@
 
 package org.jberet.schedule;
 
+import static jakarta.batch.runtime.BatchStatus.COMPLETED;
+import static jakarta.batch.runtime.BatchStatus.FAILED;
+import static jakarta.batch.runtime.BatchStatus.STARTED;
+import static jakarta.batch.runtime.BatchStatus.STOPPED;
+import static jakarta.batch.runtime.BatchStatus.STOPPING;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
+
 import jakarta.batch.api.BatchProperty;
 import jakarta.batch.api.listener.AbstractJobListener;
 import jakarta.batch.runtime.BatchStatus;
@@ -20,13 +27,10 @@
 import jakarta.batch.runtime.context.JobContext;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-
 import org.jberet.schedule._private.ScheduleExecutorLogger;
 
-import static jakarta.batch.runtime.BatchStatus.*;
-
 /**
- * An implementation of {@code javax.batch.api.listener.JobListener} that
+ * An implementation of {@code jakarta.batch.api.listener.JobListener} that
  * schedules the next execution of the same job to start some time after
  * the current execution ends.
  * <p>