Some refactoring of linq extensions and naming.