small api changes and naming