Fixed a few issues with naming fields.