[BUGFIX] Fix some broken classname substitutions in scheduler