Cullen version of overlayname change 

This takes dean's patch for overlay names and add in some more changes.