class renaming + sout