Some renames and fix up for console testers