More Class Names

Will soon migrate to online list for hot-switching.