Changed naming conventions back to Qt conventions.