Yeah, size classification is always tricky since the reference point always moves.

If you deal more with large datasets, the spectrum would ideally move to the right for you, as you have described, since you probably need a trillion on that scale.