More name refactors and comment edits