demo fixes for field renaming