updating cartan_type to reflect rename
merging