Changing names based on feedback from @willingc