Fix wrong function names
Add packaging