variables renaming to respect the conventional writing