rename more acronyms

java/ql/lib/semmle/code/java/deadcode/DeadCode.qll

@@ -162,7 +162,7 @@ class LiveClass extends SourceClassOrInterface {
     exists(LiveField f | f.getDeclaringType() = this |
       // A `serialVersionUID` field is considered to be a live field, but is
       // not be enough to be make this class live.
-      not f instanceof SerialVersionUIDField
+      not f instanceof SerialVersionUidField
     )
     or
     // If this is a namespace class, it is live if there is at least one live nested class.
@@ -250,7 +250,7 @@ class DeadMethod extends Callable {
     // These getters and setters are often generated in an ad-hoc way by the developer, which leads to
     // methods that are theoretically dead, but uninteresting. We therefore ignore them, so long as
     // they are "simple".
-    not exists(JPAReadField readField | this.getDeclaringType() = readField.getDeclaringType() |
+    not exists(JpaReadField readField | this.getDeclaringType() = readField.getDeclaringType() |
       this.(GetterMethod).getField() = readField or
       this.(SetterMethod).getField() = readField
     )

java/ql/lib/semmle/code/java/deadcode/DeadField.qll

@@ -87,8 +87,8 @@ abstract class WhitelistedLiveField extends Field { }
  * A static, final, long field named `serialVersionUID` in a class that extends `Serializable` acts as
  * a version number for the serialization framework.
  */
-class SerialVersionUIDField extends ReflectivelyReadField {
-  SerialVersionUIDField() {
+class SerialVersionUidField extends ReflectivelyReadField {
+  SerialVersionUidField() {
     this.hasName("serialVersionUID") and
     this.isStatic() and
     this.isFinal() and
@@ -97,6 +97,9 @@ class SerialVersionUIDField extends ReflectivelyReadField {
   }
 }
 
+/** DEPRECATED: Alias for SerialVersionUidField */
+deprecated class SerialVersionUIDField = SerialVersionUidField;
+
 /**
  * A field is read by the JAXB during serialization if it is a JAXB bound field, and if the
  * containing class is considered "live".
@@ -154,8 +157,8 @@ class JacksonMixinReflextivelyReadField extends ReflectivelyReadField {
 /**
  * A field which is read by a JPA compatible Java persistence framework.
  */
-class JPAReadField extends ReflectivelyReadField {
-  JPAReadField() {
+class JpaReadField extends ReflectivelyReadField {
+  JpaReadField() {
     exists(PersistentEntity entity |
       this = entity.getAField() and
       (
@@ -169,3 +172,6 @@ class JPAReadField extends ReflectivelyReadField {
     )
   }
 }
+
+/** DEPRECATED: Alias for JpaReadField */
+deprecated class JPAReadField = JpaReadField;

java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll

@@ -128,8 +128,8 @@ class JacksonMixinCallableEntryPoint extends EntryPoint {
   override Callable getALiveCallable() { result = this }
 }
 
-class JAXAnnotationReflectivelyConstructedClass extends ReflectivelyConstructedClass {
-  JAXAnnotationReflectivelyConstructedClass() {
+class JaxAnnotationReflectivelyConstructedClass extends ReflectivelyConstructedClass {
+  JaxAnnotationReflectivelyConstructedClass() {
     this instanceof JaxWsEndpoint or
     this instanceof JaxbXmlRegistry or
     this instanceof JaxRsResourceClass or
@@ -137,6 +137,10 @@ class JAXAnnotationReflectivelyConstructedClass extends ReflectivelyConstructedC
   }
 }
 
+/** DEPRECATED: Alias for JaxAnnotationReflectivelyConstructedClass */
+deprecated class JAXAnnotationReflectivelyConstructedClass =
+  JaxAnnotationReflectivelyConstructedClass;
+
 class DeserializedClass extends ReflectivelyConstructedClass {
   DeserializedClass() {
     exists(CastingExpr cast, ReadObjectMethod readObject |
@@ -342,8 +346,8 @@ class GsonDeserializationEntryPoint extends ReflectivelyConstructedClass {
   }
 }
 
-class JAXBDeserializationEntryPoint extends ReflectivelyConstructedClass {
-  JAXBDeserializationEntryPoint() {
+class JaxbDeserializationEntryPoint extends ReflectivelyConstructedClass {
+  JaxbDeserializationEntryPoint() {
     // A class can be deserialized by JAXB if it's an `XmlRootElement`...
     this.getAnAnnotation().getType().hasQualifiedName("javax.xml.bind.annotation", "XmlRootElement")
     or
@@ -356,6 +360,9 @@ class JAXBDeserializationEntryPoint extends ReflectivelyConstructedClass {
   }
 }
 
+/** DEPRECATED: Alias for JaxbDeserializationEntryPoint */
+deprecated class JAXBDeserializationEntryPoint = JaxbDeserializationEntryPoint;
+
 /**
  * A `javax.annotation` for a method that is called after or before dependency injection on a type.
  *

java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll

@@ -104,8 +104,8 @@ class SpringAspect extends CallableEntryPoint {
 /**
  * Spring Shell provides annotations for identifying methods that contribute CLI commands.
  */
-class SpringCLI extends CallableEntryPoint {
-  SpringCLI() {
+class SpringCli extends CallableEntryPoint {
+  SpringCli() {
     (
       hasAnnotation("org.springframework.shell.core.annotation", "CliCommand") or
       hasAnnotation("org.springframework.shell.core.annotation", "CliAvailabilityIndicator")
@@ -116,6 +116,9 @@ class SpringCLI extends CallableEntryPoint {
   }
 }
 
+/** DEPRECATED: Alias for SpringCli */
+deprecated class SpringCLI = SpringCli;
+
 /**
  * An entry point which acts as a remote API for a Flex application to access a Spring application.
  */

java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll

@@ -58,15 +58,18 @@ class ServletFilterClass extends ReflectivelyConstructedClass {
 /**
  * An entry point into a GWT application.
  */
-class GWTEntryPointConstructedClass extends ReflectivelyConstructedClass {
-  GWTEntryPointConstructedClass() { this.(GwtEntryPointClass).isLive() }
+class GwtEntryPointConstructedClass extends ReflectivelyConstructedClass {
+  GwtEntryPointConstructedClass() { this.(GwtEntryPointClass).isLive() }
 }
 
+/** DEPRECATED: Alias for GwtEntryPointConstructedClass */
+deprecated class GWTEntryPointConstructedClass = GwtEntryPointConstructedClass;
+
 /**
  * Servlets referred to from a GWT module config file.
  */
-class GWTServletClass extends ReflectivelyConstructedClass {
-  GWTServletClass() {
+class GwtServletClass extends ReflectivelyConstructedClass {
+  GwtServletClass() {
     this instanceof ServletClass and
     // There must be evidence that GWT is being used, otherwise missing `*.gwt.xml` files could cause
     // all `Servlet`s to be live.
@@ -81,6 +84,9 @@ class GWTServletClass extends ReflectivelyConstructedClass {
   }
 }
 
+/** DEPRECATED: Alias for GwtServletClass */
+deprecated class GWTServletClass = GwtServletClass;
+
 /**
  * Methods that may be called reflectively by the UiHandler framework.
  */