Port this step by step as it's more than just changing names.


svn path=/trunk/KDE/kdemultimedia/juk/; revision=597231