fix names that are shitty for java