Move modeline renaming to a more logical place