Renamed some ids, to Camel convention.