#18 commonize to Common