[TASK] Fix Test Generation with newer class names

This should prevent builder from using newer class names.
Otherwise it would use always newer class Names for 6.x

For running tests on a 4.5 environment, we _need_ underscored naming.