Updated function names and filter names that clashed or made little sense

git-svn-id: https://plugins.svn.wordpress.org/wpbasis/trunk@929858 b8457f37-d9ea-0310-8a92-e5e31aec5664