name changes, more api uniformity