removed last remnants of old naming scheme