#1746 - implement name changes requested by Javier