added fixes for type names with numbers after underscores