Method renames, better logging.