Large-scale renaming to clarify package roles