Proxies re generated, entity typos fixed

Generating proxies is a great way to test some common typo issues in
your entity classes, found some when regenerating proxies.