Renaming variables as requested by @jagtalon also harmonising on underscores instead of camelcase
Adding the ip Class to the output and updating tests accordingly