FIX Some references to old project