Re #10803 Simplified naming for all classes involved

(e.g. removed Direct from almost all classes as they are in Direct folder anyway)