Issue #1259362 by joachim, undertext: Use machine_name element that's now in core for module_name