Properly keep up with changed files

* I must have forgotten about this in an earlier refactor