Clean up figure naming scheme.
replies almost done