updating to reflect API a bit more closely in method naming