Updated Naming Structure

updated naming again to make stuff easier to use