Merge "Change naming pattern of implicit zen rules" into main