Move name difference fix

There were a few moves in proxydatacontainer.h and enums.h that had name conflicts.

Fixed them.