Bugfix/pip naming conflicts