Removed name field from various places to undo errors from db changes.