Entity Data Model generated code naming issue

Hey guys,

When I add a new ADO.NET Entity Data Model it generates code for me to facilitate communication with a database. This works nicely, so when I have a table called table it will create a type called TestEntities which has an ObjectQuery<table> called table. I was a bit surprised by the name as it represents all rows in the database. Now when I edit the name table in the Model Designer the code is regenerated and suddenly the ObjectQuery<table> is called tableSet, which makes a lot more sense as a name. Is anyone familiar with this issue?

Thanks, Bas