fix names and dependencies