Error upgrading to 6.0.4

Hi

I've upgraded to version 6.0.4 (from 6.0.3.1) but I'm getting this error when I attempt SaveChanged() on the entity manager:

"Key 'Context': The model's metadata artifact files (csdl, msl, ssdl) are either invalid or could not be found, either as resources in an assembly or loose in the output directory. Perhaps you have multiple assemblies containing the same metadata. Check the connection string for key 'Context', which says the artifact filenames are Model.csdl, Model.ssdl, and Model.msl. Do these names match the actual artifact filenames? All three root names (e.g., 'Model') should be the same and match the edmx filename unless you changed them deliberately."

An inner exception says:

Schema specified is not valid. Errors:
Model.csdl(30,4) : error 0019: Each type name in a schema must be unique. Type name 'Model.Entity' was already defined.
Model.csdl(39,4) : error 0019: Each type name in a schema must be unique. Type name 'Model.Entry' was already defined.

..etc (listing all entities and complex type has already been defined)

I'm not sure how to resolve this. It builds OK and the connection strings all look correct.

Regards

Lee