Renaming to make it easier to understand code and add icon