Fix naming component handling / modification.