Issue #2043527 followup by tim.plunkett: Fixed Theme name is included in block machine name but should be stored as a key instead.
