renamed note segment finders and renamed some tests