merge in updated names from initcond branch
same interface between develop and initcond branch