Field renaming. Refs #12