Renaming for better clarity
Improved displaying