final naming fixes; distutils (WIP)