Remove XXXX naming