XD-927: Use ModuleType enum everywhere