update super and generator implementation with new refactored names