change names to be compatible with the MS .Net and jdbc driver