Renames.
Comment.
Some renames. Making the test classes match convention - MY CONVENTION.