diff --git a/librarymanagement/src/main/datatype/librarymanagement.json b/librarymanagement/src/main/datatype/librarymanagement.json
index 46fbbe0b5..7e01e4424 100644
--- a/librarymanagement/src/main/datatype/librarymanagement.json
+++ b/librarymanagement/src/main/datatype/librarymanagement.json
@@ -192,7 +192,7 @@
         { "name": "organization", "type": "String", "default": "\"*\"", "since": "0.0.1" },
         { "name": "module",       "type": "String", "default": "\"*\"", "since": "0.0.1" }
       ],
-      "parentsCompanion": "sbt.librarymanagement.ConflictManagerCompanion"
+      "parentsCompanion": "sbt.librarymanagement.ConflictManagerFunctions"
     },
     {
       "name": "IvyScala",
@@ -209,7 +209,7 @@
         { "name": "scalaOrganization",    "type": "String",  "default": "sbt.librarymanagement.ScalaArtifacts.Organization", "since": "0.0.1" },
         { "name": "scalaArtifacts",       "type": "String*", "default": "sbt.librarymanagement.ScalaArtifacts.Artifacts",    "since": "0.0.1" }
       ],
-      "parentsCompanion": "sbt.librarymanagement.IvyScalaCompanion"
+      "parentsCompanion": "sbt.librarymanagement.IvyScalaFunctions"
     },
     {
       "name": "ModuleSettings",
@@ -257,7 +257,7 @@
             { "name": "defaultConfiguration", "type": "sbt.librarymanagement.Configuration?",             "default": "None",                                          "since": "0.0.1" },
             { "name": "conflictManager",      "type": "sbt.librarymanagement.ConflictManager",            "default": "sbt.librarymanagement.ConflictManager.default", "since": "0.0.1" }
           ],
-          "parentsCompanion": "sbt.internal.librarymanagement.InlineConfigurationCompanion"
+          "parentsCompanion": "sbt.internal.librarymanagement.InlineConfigurationFunctions"
         }
       ]
     },
@@ -290,7 +290,7 @@
         { "name": "artifact",       "type": "String",  "default": "\"*\"",        "since": "0.0.1" },
         { "name": "configurations", "type": "String*", "default": "Vector.empty", "since": "0.0.1" }
       ],
-      "parentsCompanion": "sbt.librarymanagement.InclExclRuleCompanion"
+      "parentsCompanion": "sbt.librarymanagement.InclExclRuleFunctions"
     },
     {
       "name": "CrossVersion",
@@ -335,7 +335,7 @@
           ]
         }
       ],
-      "parentsCompanion": "sbt.librarymanagement.CrossVersionCompanion"
+      "parentsCompanion": "sbt.librarymanagement.CrossVersionFunctions"
     },
     {
       "name": "Configuration",
@@ -368,7 +368,7 @@
         { "name": "url",             "type": "java.net.URL?",                        "default": "None",                      "since": "0.0.1" },
         { "name": "extraAttributes", "type": "Map[String, String]",                  "default": "Map.empty",                 "since": "0.0.1" }
       ],
-      "parentsCompanion": "sbt.librarymanagement.ArtifactCompanion"
+      "parentsCompanion": "sbt.librarymanagement.ArtifactFunctions"
     },
     {
       "name": "SshAuthentication",
@@ -437,7 +437,7 @@
         "\"Patterns(ivyPatterns=%s, artifactPatterns=%s, isMavenCompatible=%s, descriptorOptional=%s, skipConsistencyCheck=%s)\".format(",
         "  ivyPatterns, artifactPatterns, isMavenCompatible, descriptorOptional, skipConsistencyCheck)"
       ],
-      "parentsCompanion": "sbt.librarymanagement.PatternsCompanion"
+      "parentsCompanion": "sbt.librarymanagement.PatternsFunctions"
     },
     {
       "name": "Resolver",
@@ -575,7 +575,7 @@
           ]
         }
       ],
-      "parentsCompanion": "sbt.librarymanagement.ResolverCompanion"
+      "parentsCompanion": "sbt.librarymanagement.ResolverFunctions"
     },
     {
       "name": "ModuleConfiguration",
@@ -693,7 +693,7 @@
         "  (configurations match { case Some(s) => \":\" + s; case None => \"\" }) +",
         "  (if (extraAttributes.isEmpty) \"\" else \" \" + extraString)"
       ],
-      "parentsCompanion": "sbt.librarymanagement.ModuleIDCompanion"
+      "parentsCompanion": "sbt.librarymanagement.ModuleIDFunctions"
     },
     {
       "name": "ArtifactTypeFilter",
@@ -718,7 +718,7 @@
           "type": "boolean"
         }
       ],
-      "parentsCompanion": "sbt.librarymanagement.ArtifactTypeFilterCompanion"
+      "parentsCompanion": "sbt.librarymanagement.ArtifactTypeFilterFunctions"
     },
     {
       "name": "UpdateReport",
diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala
index 96cdf1585..74bdde758 100644
--- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala
@@ -5,7 +5,7 @@ package sbt.internal.librarymanagement
 
 import sbt.librarymanagement._
 
-abstract class InlineConfigurationCompanion {
+abstract class InlineConfigurationFunctions {
   def configurations(explicitConfigurations: Iterable[Configuration], defaultConfiguration: Option[Configuration]) =
     if (explicitConfigurations.isEmpty) {
       defaultConfiguration match {
diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
index 590d686c8..e3a2d2793 100644
--- a/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
@@ -30,7 +30,7 @@ abstract class ArtifactExtra {
 
 import Configurations.{ Optional, Pom, Test }
 
-abstract class ArtifactCompanion {
+abstract class ArtifactFunctions {
   def apply(name: String, extra: Map[String, String]): Artifact = Artifact(name, DefaultType, DefaultExtension, None, Vector.empty, None, extra)
   def apply(name: String, classifier: String): Artifact = Artifact(name, DefaultType, DefaultExtension, Some(classifier), Vector.empty, None)
   def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, None, Vector.empty, None)
diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala
index 88b15cf6a..77cf913ed 100644
--- a/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala
@@ -5,7 +5,7 @@ import sbt.internal.librarymanagement.cross.CrossVersionUtil
 
 final case class ScalaVersion(full: String, binary: String)
 
-abstract class CrossVersionCompanion {
+abstract class CrossVersionFunctions {
   /** The first `major.minor` Scala version that the Scala binary version should be used for cross-versioning instead of the full version. */
   val TransitionScalaVersion = CrossVersionUtil.TransitionScalaVersion
 
diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
index 538dd0b80..cded9dcb5 100644
--- a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
@@ -6,7 +6,7 @@ package sbt.librarymanagement
 import org.apache.ivy.core.module.descriptor
 import org.apache.ivy.util.filter.{ Filter => IvyFilter }
 
-abstract class InclExclRuleCompanion {
+abstract class InclExclRuleFunctions {
   def everything = new InclExclRule("*", "*", "*", Vector.empty)
 }
 
@@ -20,7 +20,7 @@ abstract class ArtifactTypeFilterExtra {
   def apply(a: descriptor.Artifact): Boolean = (types contains a.getType) ^ inverted
 }
 
-abstract class ArtifactTypeFilterCompanion {
+abstract class ArtifactTypeFilterFunctions {
   def allow(types: Set[String]) = ArtifactTypeFilter(types, false)
   def forbid(types: Set[String]) = ArtifactTypeFilter(types, true)
 
@@ -29,7 +29,7 @@ abstract class ArtifactTypeFilterCompanion {
   }
 }
 
-abstract class ConflictManagerCompanion {
+abstract class ConflictManagerFunctions {
   // To avoid NPE (or making the val's below lazy)
   // For case classes refchecks rewrites apply calls to constructor calls, we have to do it manually
   def apply(name: String, organization: String = "*", module: String = "*"): ConflictManager
diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
index c45b84799..39ecbace4 100644
--- a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
@@ -45,7 +45,7 @@ object SbtArtifacts {
 
 import ScalaArtifacts._
 
-private[sbt] abstract class IvyScalaCompanion {
+private[sbt] abstract class IvyScalaFunctions {
   /** Performs checks/adds filters on Scala dependencies (if enabled in IvyScala). */
   def checkModule(module: DefaultModuleDescriptor, conf: String, log: Logger)(check: IvyScala): Unit = {
     if (check.checkExplicit)
diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
index 2f802017e..d3bb3feaa 100644
--- a/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
@@ -151,7 +151,7 @@ abstract class ModuleIDExtra {
   def branch(branchName: Option[String]) = copy(branchName = branchName)
 }
 
-abstract class ModuleIDCompanion {
+abstract class ModuleIDFunctions {
   /** Prefixes all keys with `e:` if they are not already so prefixed. */
   def checkE(attributes: Seq[(String, String)]) =
     for ((key, value) <- attributes) yield if (key.startsWith("e:")) (key, value) else ("e:" + key, value)
diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala
index 12a4c03f6..75be6d228 100644
--- a/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala
@@ -26,7 +26,7 @@ final class RawRepository(val resolver: DependencyResolver) extends Resolver(res
     }
 }
 
-abstract class PatternsCompanion {
+abstract class PatternsFunctions {
   implicit def defaultPatterns: Patterns = Resolver.defaultPatterns
 
   def apply(artifactPatterns: String*): Patterns = Patterns(true, artifactPatterns: _*)
@@ -48,7 +48,7 @@ trait ResolversSyntax {
   val JCenterRepository = new MavenRepository(JCenterRepositoryName, JCenterRepositoryRoot)
 }
 
-abstract class ResolverCompanion {
+abstract class ResolverFunctions {
   private[sbt] def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true
 
   val TypesafeRepositoryRoot = typesafeRepositoryRoot(useSecureResolvers)