Finish the filename consistency refactor