Changed class name in preparation for new drawings