More allocation work; some naming tweaks