[ADD][FIX] add function and fix names