Fix phy/ast/gen mapping to uppercase (assume uppercase from the datastore)