addressed naming inconsitencies