Rename things and remove 'echo' code.