variables renaming to match trough the classes