fixing naming scheme