Remove confusing naming scheme