naming and class edits