Having said that, maybe we should strive for consistency to facilitate the next iteration:

The refactoring which will convert one-class per Package to one-object per Package.

��