fixed small changes in naming scheme