Generator: Cleaned the filenames/classnames