Modified Project and renamed base OM objects