Fix class names that were showing module names instead, where needed.