renamed types package in Scala, too