Store the names properly.