Rename class name
Apply SSO edits
Fix merge errors