diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
index 890cf29373d5..dfcd01bf932a 100644
--- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
+++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
@@ -50,6 +50,7 @@ public class BaseNameableObject extends BaseIdentifiableObject implements Nameab
   /** Description of this object. */
   protected String description;
 
+  /** Name to be displayed in data entry forms. */
   protected String formName;
 
   // -------------------------------------------------------------------------
diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
index 7176a7e8c91b..96d210f51f93 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
@@ -59,7 +59,7 @@ public class DefaultCalendarService implements CalendarService {
   private final Map<String, Calendar> calendarMap = Maps.newHashMap();
 
   private static final List<DateFormat> DATE_FORMATS =
-      Lists.newArrayList(
+      List.of(
           new DateFormat("yyyy-MM-dd", "yyyy-MM-dd", "yyyy-MM-dd", "yyyy-mm-dd"),
           new DateFormat("dd-MM-yyyy", "dd-MM-yyyy", "dd-MM-yyyy", "dd-mm-yyyy"));