more name enter changes
fixed merge conflicts