Made class name less confusing