Fixed issue when field name is the same as one of java types