Now replaced dashed which are not supported in class or field names