More renaming; consolidating code for more reuse.