Good question! In a sense, yes. But I'd separate repairability and modularity into different categories, actually. Something could be designed to be easy to repair but not necessarily to be modular (in the sense of swappable upgrades or swappable features), for instance.