fix for naming in common and core projects