Class-prefixes re-added.