diff --git a/drivers/acpi/cmbatt/cmbatt.c b/drivers/acpi/cmbatt/cmbatt.c
index dd01f8b22be..888e4c30ad9 100644
--- a/drivers/acpi/cmbatt/cmbatt.c
+++ b/drivers/acpi/cmbatt/cmbatt.c
@@ -724,8 +724,8 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject,
                 if (InputBufferLength == sizeof(ULONG))
                 {
                     /* Query it */
-                    Status = CmBattSetTripPpoint(DeviceExtension,
-                                                 *(PULONG)Irp->AssociatedIrp.SystemBuffer);
+                    Status = CmBattSetTripPoint(DeviceExtension,
+                                                *(PULONG)Irp->AssociatedIrp.SystemBuffer);
                     Irp->IoStatus.Information = 0;
                 }
                 else
@@ -895,7 +895,7 @@ CmBattDisableStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension)
         {
             /* Reset it back to 0 */
             DeviceExtension->TripPointValue = 0;
-            Status = CmBattSetTripPpoint(DeviceExtension, 0);
+            Status = CmBattSetTripPoint(DeviceExtension, 0);
             if (!NT_SUCCESS(Status))
             {
                 /* If it failed, set unknown/invalid value */
@@ -1029,7 +1029,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension,
 
     /* Set the trip point with ACPI and check for success */
     DeviceExtension->TripPointValue = NewTripPoint;
-    Status = CmBattSetTripPpoint(DeviceExtension, NewTripPoint);
+    Status = CmBattSetTripPoint(DeviceExtension, NewTripPoint);
     if (!(NewTripPoint) && (Capacity)) Status = STATUS_NOT_SUPPORTED;
     if (!NT_SUCCESS(Status))
     {
diff --git a/drivers/acpi/cmbatt/cmbatt.h b/drivers/acpi/cmbatt/cmbatt.h
index 4a2ec81acd3..f85ca36c650 100644
--- a/drivers/acpi/cmbatt/cmbatt.h
+++ b/drivers/acpi/cmbatt/cmbatt.h
@@ -260,7 +260,7 @@ CmBattGetBixData(
 
 NTSTATUS
 NTAPI
-CmBattSetTripPpoint(
+CmBattSetTripPoint(
     PCMBATT_DEVICE_EXTENSION DeviceExtension,
     ULONG AlarmValue
 );
diff --git a/drivers/acpi/cmbatt/cmbpnp.c b/drivers/acpi/cmbatt/cmbpnp.c
index baddaa6efa9..60840975ea2 100644
--- a/drivers/acpi/cmbatt/cmbpnp.c
+++ b/drivers/acpi/cmbatt/cmbpnp.c
@@ -678,7 +678,7 @@ CmBattAddBattery(IN PDRIVER_OBJECT DriverObject,
     FdoExtension->TripPointValue = BATTERY_UNKNOWN_CAPACITY;
     FdoExtension->Tag = 0;
     FdoExtension->InterruptTime = KeQueryInterruptTime();
-    FdoExtension->TripPointSet = CmBattSetTripPpoint(FdoExtension, 0) !=
+    FdoExtension->TripPointSet = CmBattSetTripPoint(FdoExtension, 0) !=
                                  STATUS_OBJECT_NAME_NOT_FOUND;
 
     /* Setup the battery miniport information structure */
diff --git a/drivers/acpi/cmbatt/cmexec.c b/drivers/acpi/cmbatt/cmexec.c
index 6caf314617c..2986c710bb5 100644
--- a/drivers/acpi/cmbatt/cmexec.c
+++ b/drivers/acpi/cmbatt/cmexec.c
@@ -13,9 +13,9 @@
 #include <acpiioct.h>
 #include <debug.h>
 
-typedef struct
+typedef struct _ACPI_PACKAGE_FIELD
 {
-    LPSTR Name;
+    PSTR Name;
     BOOLEAN IsString;
     PVOID Data;
 } ACPI_PACKAGE_FIELD, *PACPI_PACKAGE_FIELD;
@@ -377,14 +377,14 @@ CmBattGetUniqueId(IN PDEVICE_OBJECT DeviceObject,
 
 NTSTATUS
 NTAPI
-CmBattSetTripPpoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension,
-                    IN ULONG AlarmValue)
+CmBattSetTripPoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension,
+                   IN ULONG AlarmValue)
 {
     NTSTATUS Status;
     ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER InputBuffer;
     PAGED_CODE();
     if (CmBattDebug & 0x440)
-        DbgPrint("CmBattSetTripPpoint: _BTP Alarm Value %x Device %x Tid %x\n",
+        DbgPrint("CmBattSetTripPoint: _BTP Alarm Value %x Device %x Tid %x\n",
                  AlarmValue, DeviceExtension->DeviceId, KeGetCurrentThread);
 
     /* Request the _BTP method */
@@ -400,7 +400,7 @@ CmBattSetTripPpoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension,
                                      NULL,
                                      0);
     if (!(NT_SUCCESS(Status)) && (CmBattDebug & 0x440))
-        DbgPrint("CmBattSetTripPpoint: Failed _BTP method on device %x - Status (0x%x)\n",
+        DbgPrint("CmBattSetTripPoint: Failed _BTP method on device %x - Status (0x%x)\n",
                  DeviceExtension->DeviceId, Status);
 
     /* Return status */