Changes to how classnames and collections are specified