rework so the last part of the name has no space