[dev] More work on EOS class renaming.