My errors were similar.  I resolved them by using Visual Studio and viewing the suspect page in design view, then saving.  It rewrote the designer.cs file and cleared up all the discrepancies.