naming changes for less confusion and organizer code compacting