Some renaming, and a little Vim plugin