Cleaner naming / terminology.