diff --git a/src/getvideo_main.cpp b/src/getvideo_main.cpp
index bc4d75b..7055d35 100644
--- a/src/getvideo_main.cpp
+++ b/src/getvideo_main.cpp
@@ -20,12 +20,12 @@
 #include <ast_video_puller.hpp>
 
 int main() {
-  AstVideo::RawVideoBuffer out;
+  ast_video::RawVideoBuffer out;
   bool have_hardware = false;
   if (access("/dev/video", F_OK) != -1) {
-    AstVideo::SimpleVideoPuller p;
+    ast_video::SimpleVideoPuller p;
     p.initialize();
-    out = p.read_video();
+    out = p.readVideo();
   } else {
     FILE *fp = fopen("/home/ed/screendata.bin", "rb");
     if (fp != nullptr) {
@@ -36,29 +36,29 @@
       }
       fclose(fp);
       out.buffer.resize(newLen);
-      out.mode = AstVideo::YuvMode::YUV444;
+      out.mode = ast_video::YuvMode::YUV444;
       out.width = 800;
       out.height = 600;
-      out.y_selector = 0;
-      out.uv_selector = 0;
+      out.ySelector = 0;
+      out.uvSelector = 0;
     }
   }
 
   FILE *fp = fopen("/tmp/screendata.bin", "wb");
   fwrite(out.buffer.data(), sizeof(char), out.buffer.size(), fp);
 
-  AstVideo::AstJpegDecoder d;
-  d.decode(out.buffer, out.width, out.height, out.mode, out.y_selector,
-           out.uv_selector);
+  ast_video::AstJpegDecoder d;
+  d.decode(out.buffer, out.width, out.height, out.mode, out.ySelector,
+           out.uvSelector);
 #ifdef BUILD_CIMG
   cimg_library::CImg<unsigned char> image(out.width, out.height, 1,
                                           3 /*numchannels*/);
   for (int y = 0; y < out.height; y++) {
     for (int x = 0; x < out.width; x++) {
-      auto pixel = d.OutBuffer[x + (y * out.width)];
-      image(x, y, 0) = pixel.R;
-      image(x, y, 1) = pixel.G;
-      image(x, y, 2) = pixel.B;
+      auto pixel = d.outBuffer[x + (y * out.width)];
+      image(x, y, 0) = pixel.r;
+      image(x, y, 1) = pixel.g;
+      image(x, y, 2) = pixel.b;
     }
   }
   image.save("/tmp/file2.bmp");