Removing all references to old namt - kitsune