Rename some things
Make training more robust to parser errors on dev