diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
index d71ae35ccc..cfd9615013 100644
--- a/apriltag/CMakeLists.txt
+++ b/apriltag/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(fieldImages)
+project(apriltag)
 
 include(CompileWarnings)
 include(GenResources)
@@ -9,33 +9,33 @@ if (WITH_JAVA)
 
      file(GLOB JACKSON_JARS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/*.jar")
 
-     set(CMAKE_JAVA_INCLUDE_PATH apriltags.jar ${JACKSON_JARS})
+     set(CMAKE_JAVA_INCLUDE_PATH apriltag.jar ${JACKSON_JARS})
 
      file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java)
      file(GLOB_RECURSE JAVA_RESOURCES src/main/native/resources/*.json)
-     add_jar(apriltags_jar SOURCES ${JAVA_SOURCES} RESOURCES NAMESPACE "edu/wpi/first/apriltag" ${JAVA_RESOURCES} INCLUDE_JARS wpimath_jar OUTPUT_NAME apriltag)
+     add_jar(apriltag_jar SOURCES ${JAVA_SOURCES} RESOURCES NAMESPACE "edu/wpi/first/apriltag" ${JAVA_RESOURCES} INCLUDE_JARS wpimath_jar OUTPUT_NAME apriltag)
 endif()
 
 
-GENERATE_RESOURCES(src/main/native/resources/edu/wpi/first/apriltag generated/main/cpp APRILTAG frc apriltags_resources_src)
+GENERATE_RESOURCES(src/main/native/resources/edu/wpi/first/apriltag generated/main/cpp APRILTAG frc apriltag_resources_src)
 
-file(GLOB_RECURSE apriltags_native_src src/main/native/cpp/*.cpp)
+file(GLOB_RECURSE apriltag_native_src src/main/native/cpp/*.cpp)
 
-add_library(apriltags ${apriltags_native_src} ${apriltags_resources_src})
-set_target_properties(apriltags PROPERTIES DEBUG_POSTFIX "d")
+add_library(apriltag ${apriltag_native_src} ${apriltag_resources_src})
+set_target_properties(apriltag PROPERTIES DEBUG_POSTFIX "d")
 
-set_property(TARGET apriltags PROPERTY FOLDER "libraries")
-target_compile_features(apriltags PUBLIC cxx_std_20)
-wpilib_target_warnings(apriltags)
-target_link_libraries(apriltags wpimath)
+set_property(TARGET apriltag PROPERTY FOLDER "libraries")
+target_compile_features(apriltag PUBLIC cxx_std_20)
+wpilib_target_warnings(apriltag)
+target_link_libraries(apriltag wpimath)
 
-target_include_directories(apriltags PUBLIC
+target_include_directories(apriltag PUBLIC
                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
-                            $<INSTALL_INTERFACE:${include_dest}/apriltags>)
+                            $<INSTALL_INTERFACE:${include_dest}/apriltag>)
 
 
 if (WITH_TESTS)
-    wpilib_add_test(apriltags src/test/native/cpp)
-    target_include_directories(apriltags_test PRIVATE src/test/native/include)
-    target_link_libraries(apriltags_test apriltags gmock_main)
+    wpilib_add_test(apriltag src/test/native/cpp)
+    target_include_directories(apriltag_test PRIVATE src/test/native/include)
+    target_link_libraries(apriltag_test apriltag gmock_main)
 endif()
diff --git a/apriltag/build.gradle b/apriltag/build.gradle
index 2422918f7a..d10366b75e 100644
--- a/apriltag/build.gradle
+++ b/apriltag/build.gradle
@@ -1,10 +1,10 @@
 apply from: "${rootDir}/shared/resources.gradle"
 
 ext {
-    nativeName = 'apriltags'
+    nativeName = 'apriltag'
     devMain = 'edu.wpi.first.apriltag.DevMain'
 
-    def generateTask = createGenerateResourcesTask('main', 'APRILTAGS', 'frc', project)
+    def generateTask = createGenerateResourcesTask('main', 'APRILTAG', 'frc', project)
 
     tasks.withType(CppCompile) {
         dependsOn generateTask