Made name module save more efficient