Update for space and custom names, generations