Bug fix: Let's make this class name more generic