put the two FieldConstants.h files in their proper namespaces