Reverted setting class renaming