Some cleaning amongst responses.
Some renamings.