Make name less confusing