Further synchronizations with md32_common.h update, consistent naming