Names have to be renamed because we need property names