Changed masking to always use 6 x's instead of the same number as letters in the name.