FIX: old names still appearing in the code