diff --git a/y2017/wpilib_interface.cc b/y2017/wpilib_interface.cc
index 4fac858..e55e350 100644
--- a/y2017/wpilib_interface.cc
+++ b/y2017/wpilib_interface.cc
@@ -260,7 +260,7 @@
           auto_mode_message->mode |= 1 << i;
         }
       }
-      LOG_STRUCT(DEBUG, "auto mode", *auto_mode_message);
+      AOS_LOG_STRUCT(DEBUG, "auto mode", *auto_mode_message);
       auto_mode_message.Send();
     }
   }
@@ -315,13 +315,13 @@
 
   void Loop(const int iterations) {
     if (iterations != 1) {
-      LOG(DEBUG, "Solenoids skipped %d iterations\n", iterations - 1);
+      AOS_LOG(DEBUG, "Solenoids skipped %d iterations\n", iterations - 1);
     }
 
     {
       superstructure_output_fetcher_.Fetch();
       if (superstructure_output_fetcher_.get()) {
-        LOG_STRUCT(DEBUG, "solenoids", *superstructure_output_fetcher_);
+        AOS_LOG_STRUCT(DEBUG, "solenoids", *superstructure_output_fetcher_);
         lights_->Set(superstructure_output_fetcher_->lights_on);
         rgb_lights_->Set(superstructure_output_fetcher_->red_light_on |
                          superstructure_output_fetcher_->green_light_on |
@@ -387,7 +387,7 @@
 
  private:
   virtual void Write(const SuperstructureQueue::Output &output) override {
-    LOG_STRUCT(DEBUG, "will output", output);
+    AOS_LOG_STRUCT(DEBUG, "will output", output);
     intake_victor_->SetSpeed(::aos::Clip(output.voltage_intake,
                                          -kMaxBringupPower, kMaxBringupPower) /
                              12.0);
@@ -410,7 +410,7 @@
   }
 
   virtual void Stop() override {
-    LOG(WARNING, "Superstructure output too old.\n");
+    AOS_LOG(WARNING, "Superstructure output too old.\n");
     intake_victor_->SetDisabled();
     intake_rollers_victor_->SetDisabled();
     indexer_victor_->SetDisabled();