Method renaming, and LinQ improvs