Make it less dependent on my name.