Rename and add new functions and revise doc strings.