hconsole: Refactor releated renames.