changing api names and making known what's private

for cleanup