Class naming re-factory