fix naming scheme