Revert "More naming convention changes"

This reverts commit b91606c27bcb6d32bb64600c3a789b29cbed698e.

Conflicts:
	bt5/erp5_egov/bt/revision
Revert "Modify proxification so that proxy fields correspond to fields that actually exist"

This reverts commit 5506a6fe193545338db9ef58f9e608606538e70d.

Conflicts:
	bt5/erp5_egov/bt/revision