Some naming changes for better integration with MCPC+, remove unused fields in patched classes.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>