Followup on #55 / #52: replace define with namespace alias