change to shorter naming scheme