Name correction in filenames and classes (removed "Q")