Started removing eNodename references