Update keypace names; only drop them if they exist