merge in updated names from initcond branch