renamed some core methods in preparation for merging into mainline/finalizing interface