Darth Skywalker... (ModelBuilder renames)

ConventionModelBuilder becomes ModelBuilder; ModelBuilder becomes BasicModelBuilder.