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