more naming and reference fixes