Fix naming and add lodash(underscore) dependency