diff --git a/Editor/.gitignore b/Editor/.gitignore
index 6b7e217b84..aaed99ed28 100644
--- a/Editor/.gitignore
+++ b/Editor/.gitignore
@@ -1,2 +1,3 @@
 *.o
 cuki
+log
diff --git a/Editor/FileReader.cpp b/Editor/FileReader.cpp
index 0788d06b02..65f9d2a931 100644
--- a/Editor/FileReader.cpp
+++ b/Editor/FileReader.cpp
@@ -21,7 +21,7 @@ bool FileReader::can_read() const
 std::string FileReader::read_line()
 {
     if (!m_file) {
-        fprintf(stderr, "Error: FileReader::readLine() called on invalid FileReader for '%s'\n", m_path.c_str());
+        fprintf(stderr, "Error: FileReader::read_line() called on invalid FileReader for '%s'\n", m_path.c_str());
         return std::string();
     }
 
diff --git a/Editor/Line.cpp b/Editor/Line.cpp
index 431bf1d04f..f5708c1337 100644
--- a/Editor/Line.cpp
+++ b/Editor/Line.cpp
@@ -53,35 +53,35 @@ void Line::insert(size_t index, const std::string& text)
         return;
     }
 
-    auto chunkAddress = chunkIndexForPosition(index);
-    auto chunkIndex = std::get<0>(chunkAddress);
-    auto& chunk = m_chunks[chunkIndex];
-    auto indexInChunk = std::get<1>(chunkAddress);
+    auto chunk_address = chunk_index_for_position(index);
+    auto chunk_index = std::get<0>(chunk_address);
+    auto& chunk = m_chunks[chunk_index];
+    auto index_in_chunk = std::get<1>(chunk_address);
 
     static FILE* f = fopen("log", "a");
-    fprintf(f, "#Column:%zu, Chunk:%zu, Index:%zu\n", index, chunkIndex, indexInChunk);
+    fprintf(f, "#Column:%zu, Chunk:%zu, Index:%zu\n", index, chunk_index, index_in_chunk);
     
-    auto leftString = chunk.data().substr(0, indexInChunk);
-    auto rightString = chunk.data().substr(indexInChunk, chunk.length() - indexInChunk);
+    auto left_string = chunk.data().substr(0, index_in_chunk);
+    auto right_string = chunk.data().substr(index_in_chunk, chunk.length() - index_in_chunk);
 
-    fprintf(f, "#{\"%s\", \"%s\", \"%s\"}\n", leftString.c_str(), text.c_str(), rightString.c_str());
+    fprintf(f, "#{\"%s\", \"%s\", \"%s\"}\n", left_string.c_str(), text.c_str(), right_string.c_str());
     fflush(f);
 
-    Chunk leftChunk { leftString };
-    Chunk midChunk { text };
-    Chunk rightChunk { rightString };
+    Chunk left_chunk { left_string };
+    Chunk mid_chunk { text };
+    Chunk right_chunk { right_string };
 
-    auto iterator = m_chunks.begin() + chunkIndex;
+    auto iterator = m_chunks.begin() + chunk_index;
     m_chunks.erase(iterator);
-    iterator = m_chunks.begin() + chunkIndex;
+    iterator = m_chunks.begin() + chunk_index;
 
     // Note reverse insertion order!
-    m_chunks.insert(iterator, rightChunk);
-    m_chunks.insert(iterator, midChunk);
-    m_chunks.insert(iterator, leftChunk);
+    m_chunks.insert(iterator, right_chunk);
+    m_chunks.insert(iterator, mid_chunk);
+    m_chunks.insert(iterator, left_chunk);
 }
 
-std::tuple<size_t, size_t> Line::chunkIndexForPosition(size_t position)
+std::tuple<size_t, size_t> Line::chunk_index_for_position(size_t position)
 {
     ASSERT(position < length());
     size_t seen { 0 };
diff --git a/Editor/Line.h b/Editor/Line.h
index d8e65fc243..dd8e39c181 100644
--- a/Editor/Line.h
+++ b/Editor/Line.h
@@ -34,7 +34,7 @@ private:
     void append(const std::string&);
     void prepend(const std::string&);
 
-    std::tuple<size_t, size_t> chunkIndexForPosition(size_t);
+    std::tuple<size_t, size_t> chunk_index_for_position(size_t);
 
     std::deque<Chunk> m_chunks;
 };