even more api changes
rename to enable better grammar