fixes in naming scheme