more name changes and cleanup