move to buildout 2.0, fix requires names