Pad names with _ instead of = to make it easier to detect merge conflicts