Simplified makeSimpleName function
Merge branch 'WarningFixes' into i253