fixing the last few naming issues