For a little background:
I have a DLL project with the following structure:
Rivworks.Model (project) \\Negotiation (folder) Model.edmx
I had the problem too but my solution was to clean the bin directory and then remove the connection string with the entity container name. Then I could rename my entities and put back the connection string.