@anutron agree. We could remove these module names and start this debate after 1.5. Would that be ok?