APOLLO-3888 Renamed class