Added annotatedWithName to ScalaModule; Cleaned up imports