Scala renames and cleanups