[API] renaming from #868 fixed