More renaming + make test work (copied from beets, thx Adrian Sampson ;))