Good point -- will rename and cleanup.