Rename properties so as to be suitable for the case of execution without storage