Fixed field rename errors, fixes #14