Should this be a part of this PR? I'm not sure if this has already been merged as part of the last PR (regarding the class name change) or is this a new change.

Can you please shed some light on this?