Fix dev tools name conflict and missing extra requires