Some tidying to the fix class names code