Class renames and code cleanup