move the remaining references from "IntitialValue" to "BaseValue"