Change Scala's naming convention for binary compatibility