MacroUtils does not handle the new entry point names properly

The MacroUtils class has a static dictionary containing mapping from trainer kinds (classifier, regressor, etc.) to an object of type "TaskInformationBundle" which contains information about the trainer kind. Part of this information is the suffix of the entry point names of trainers of this kind. This needs to be updated because it does not currently match the existing entry point names.