Add missing use, fix names and arguments