Some suggested 2.5 code cleanups/renames