Fix storing name to db