Fix References to new Scala Class