Changed class name to separate meanings