Revert "Fixed field rename errors, fixes #14"

This reverts commit 47d8563b8859901e21e45264ede70f4876d28aa8.

This commit caused unforseen issues regarding block breaking/other state issues. Must investigate further.