Cleans up the names to work with recent re-name