Some name edits. Preparing for mesh handling overhaul.