[BUGFIX] Mentions of old class names