Fix issues when using names like ANDROID or IPHONE in an enum
Update error output