changing the naming of some items to provide consistent conventions