Almost done sorting

Just assign the name beforehand with the space replaced back in.