corrections to some types and element names