we don't care about java keywords
fix some type handling