Fix a gcc 4.8 warning
Move away from fixed record names for body parts