Update to Marco's latest xblock class names.