It still ahd some bits from the original name (geoclue2). I tried squeeze as much renaming as possible in the earlier commits but these done here would have broken the code so I do the rest all in one go here.