Clean up frame names