name changes and cleanup