If you remove the _ and . characters from the word separators list in the user preferences, this should work for you.