Changed naming standards to be more obviously part of this suite.