Changed function names to fix startup problems for vim 7.4.273 (Gentoo-7.4.273)