Updated logic to use upper case keys for the descriptor and to chop off
the "-mesh" part of the names.