Fixed field & function names for newer versions of forge