reorganizing and fixing names
continue to fix names