[DEV] update function and class naming