more function renaming
add package angle