adding function/get-name to class/shim dependencies and a little refactoring