WCM-77 Fix renamed modules