made adjustments to the naming conventions