changing names, more consistency