rename classes to avoid classes with FW1