Renamed the classnames (forget to do it in the last update)