added missing InitialValue tags and variability type names changed