Fix remaining references from previous project