updated references in CoreModule