class renaming, small changes