Revised names one last time