Change to more standard Java names